[Boost-commit] svn:boost r49133 - in branches/proto/v4: . boost boost/archive boost/archive/impl boost/archive/iterators boost/config/abi boost/exception boost/filesystem boost/function boost/graph boost/math/special_functions boost/math/tools boost/mpl boost/mpl/aux_ boost/pool boost/proto boost/python boost/python/detail boost/python/object boost/serialization boost/serialization/detail boost/spirit/home boost/spirit/home/phoenix/core/detail boost/spirit/home/phoenix/operator/detail boost/spirit/home/phoenix/scope boost/spirit/home/phoenix/scope/detail boost/spirit/home/phoenix/stl/container boost/spirit/home/qi/string boost/thread/detail boost/thread/pthread boost/tr1 boost/xpressive boost/xpressive/proto doc doc/src/images doc/src/images/callouts libs/conversion libs/exception/doc/source libs/exception/test libs/filesystem/src libs/filesystem/test libs/graph/build libs/graph/test libs/mpi/build libs/numeric/ublas/test libs/pool/test libs/python/doc libs/python/doc/v2 libs/regex/build libs/serialization/build libs/serialization/src libs/serialization/vc7ide libs/spirit/doc/lex libs/spirit/phoenix/test/algorithm libs/spirit/phoenix/test/bind libs/spirit/phoenix/test/container libs/spirit/phoenix/test/operator libs/spirit/phoenix/test/scope libs/system/src libs/system/test libs/system/test/msvc_system libs/system/test/msvc_system/error_code_test libs/test/doc/html/utf/user-guide/fixture libs/thread/test libs/type_traits/doc libs/utility status tools/boostbook/xsl tools/build/v2 tools/build/v2/build tools/build/v2/tools tools/build/v2/tools/types tools/inspect tools/jam/doc tools/jam/src tools/jam/src/modules tools/quickbook tools/quickbook/doc tools/quickbook/doc/html tools/quickbook/doc/html/images tools/quickbook/doc/html/quickbook tools/quickbook/doc/html/quickbook/editors tools/quickbook/doc/html/quickbook/install tools/quickbook/doc/html/quickbook/syntax tools/quickbook/extra/katepart

Subject: [Boost-commit] svn:boost r49133 - in branches/proto/v4: . boost boost/archive boost/archive/impl boost/archive/iterators boost/config/abi boost/exception boost/filesystem boost/function boost/graph boost/math/special_functions boost/math/tools boost/mpl boost/mpl/aux_ boost/pool boost/proto boost/python boost/python/detail boost/python/object boost/serialization boost/serialization/detail boost/spirit/home boost/spirit/home/phoenix/core/detail boost/spirit/home/phoenix/operator/detail boost/spirit/home/phoenix/scope boost/spirit/home/phoenix/scope/detail boost/spirit/home/phoenix/stl/container boost/spirit/home/qi/string boost/thread/detail boost/thread/pthread boost/tr1 boost/xpressive boost/xpressive/proto doc doc/src/images doc/src/images/callouts libs/conversion libs/exception/doc/source libs/exception/test libs/filesystem/src libs/filesystem/test libs/graph/build libs/graph/test libs/mpi/build libs/numeric/ublas/test libs/pool/test libs/python/doc libs/python/doc/v2 libs/regex/build libs/serialization/build libs/serialization/src libs/serialization/vc7ide libs/spirit/doc/lex libs/spirit/phoenix/test/algorithm libs/spirit/phoenix/test/bind libs/spirit/phoenix/test/container libs/spirit/phoenix/test/operator libs/spirit/phoenix/test/scope libs/system/src libs/system/test libs/system/test/msvc_system libs/system/test/msvc_system/error_code_test libs/test/doc/html/utf/user-guide/fixture libs/thread/test libs/type_traits/doc libs/utility status tools/boostbook/xsl tools/build/v2 tools/build/v2/build tools/build/v2/tools tools/build/v2/tools/types tools/inspect tools/jam/doc tools/jam/src tools/jam/src/modules tools/quickbook tools/quickbook/doc tools/quickbook/doc/html tools/quickbook/doc/html/images tools/quickbook/doc/html/quickbook tools/quickbook/doc/html/quickbook/editors tools/quickbook/doc/html/quickbook/install tools/quickbook/doc/html/quickbook/syntax tools/quickbook/extra/katepart
From: eric_at_[hidden]
Date: 2008-10-04 21:47:48

Author: eric_niebler
Date: 2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
New Revision: 49133
URL: http://svn.boost.org/trac/boost/changeset/49133

Log:
merged from trunk
Added:
   branches/proto/v4/boost/spirit/home/support.hpp
      - copied unchanged from r49132, /trunk/boost/spirit/home/support.hpp
   branches/proto/v4/doc/src/images/alert.png
      - copied unchanged from r49132, /trunk/doc/src/images/alert.png
   branches/proto/v4/doc/src/images/callouts/   (props changed)
      - copied from r49132, /trunk/doc/src/images/callouts/
   branches/proto/v4/doc/src/images/callouts/1.png
      - copied unchanged from r49132, /trunk/doc/src/images/callouts/1.png
   branches/proto/v4/doc/src/images/callouts/10.png
      - copied unchanged from r49132, /trunk/doc/src/images/callouts/10.png
   branches/proto/v4/doc/src/images/callouts/11.png
      - copied unchanged from r49132, /trunk/doc/src/images/callouts/11.png
   branches/proto/v4/doc/src/images/callouts/12.png
      - copied unchanged from r49132, /trunk/doc/src/images/callouts/12.png
   branches/proto/v4/doc/src/images/callouts/13.png
      - copied unchanged from r49132, /trunk/doc/src/images/callouts/13.png
   branches/proto/v4/doc/src/images/callouts/14.png
      - copied unchanged from r49132, /trunk/doc/src/images/callouts/14.png
   branches/proto/v4/doc/src/images/callouts/15.png
      - copied unchanged from r49132, /trunk/doc/src/images/callouts/15.png
   branches/proto/v4/doc/src/images/callouts/2.png
      - copied unchanged from r49132, /trunk/doc/src/images/callouts/2.png
   branches/proto/v4/doc/src/images/callouts/3.png
      - copied unchanged from r49132, /trunk/doc/src/images/callouts/3.png
   branches/proto/v4/doc/src/images/callouts/4.png
      - copied unchanged from r49132, /trunk/doc/src/images/callouts/4.png
   branches/proto/v4/doc/src/images/callouts/5.png
      - copied unchanged from r49132, /trunk/doc/src/images/callouts/5.png
   branches/proto/v4/doc/src/images/callouts/6.png
      - copied unchanged from r49132, /trunk/doc/src/images/callouts/6.png
   branches/proto/v4/doc/src/images/callouts/7.png
      - copied unchanged from r49132, /trunk/doc/src/images/callouts/7.png
   branches/proto/v4/doc/src/images/callouts/8.png
      - copied unchanged from r49132, /trunk/doc/src/images/callouts/8.png
   branches/proto/v4/doc/src/images/callouts/9.png
      - copied unchanged from r49132, /trunk/doc/src/images/callouts/9.png
   branches/proto/v4/doc/src/images/smiley.png
      - copied unchanged from r49132, /trunk/doc/src/images/smiley.png
   branches/proto/v4/libs/graph/test/is_straight_line_draw_test.cpp
      - copied unchanged from r49132, /trunk/libs/graph/test/is_straight_line_draw_test.cpp
   branches/proto/v4/libs/system/test/msvc_system/
      - copied from r49132, /trunk/libs/system/test/msvc_system/
   branches/proto/v4/libs/system/test/msvc_system/common.vsprops
      - copied unchanged from r49132, /trunk/libs/system/test/msvc_system/common.vsprops
   branches/proto/v4/libs/system/test/msvc_system/error_code_test/
      - copied from r49132, /trunk/libs/system/test/msvc_system/error_code_test/
   branches/proto/v4/libs/system/test/msvc_system/error_code_test/error_code_test.vcproj
      - copied unchanged from r49132, /trunk/libs/system/test/msvc_system/error_code_test/error_code_test.vcproj
   branches/proto/v4/libs/system/test/msvc_system/msvc_system.sln
      - copied unchanged from r49132, /trunk/libs/system/test/msvc_system/msvc_system.sln
   branches/proto/v4/tools/build/v2/tools/message.jam
      - copied unchanged from r49132, /trunk/tools/build/v2/tools/message.jam
Removed:
   branches/proto/v4/tools/quickbook/doc/html/images/alert.png
   branches/proto/v4/tools/quickbook/doc/html/images/caution.png
   branches/proto/v4/tools/quickbook/doc/html/images/home.png
   branches/proto/v4/tools/quickbook/doc/html/images/important.png
   branches/proto/v4/tools/quickbook/doc/html/images/next.png
   branches/proto/v4/tools/quickbook/doc/html/images/note.png
   branches/proto/v4/tools/quickbook/doc/html/images/prev.png
   branches/proto/v4/tools/quickbook/doc/html/images/smiley.png
   branches/proto/v4/tools/quickbook/doc/html/images/tip.png
   branches/proto/v4/tools/quickbook/doc/html/images/up.png
   branches/proto/v4/tools/quickbook/doc/html/images/warning.png
   branches/proto/v4/tools/quickbook/doc/html/index.html
   branches/proto/v4/tools/quickbook/doc/html/quickbook/change_log.html
   branches/proto/v4/tools/quickbook/doc/html/quickbook/editors.html
   branches/proto/v4/tools/quickbook/doc/html/quickbook/editors/kde_support.html
   branches/proto/v4/tools/quickbook/doc/html/quickbook/editors/scite.html
   branches/proto/v4/tools/quickbook/doc/html/quickbook/faq.html
   branches/proto/v4/tools/quickbook/doc/html/quickbook/install.html
   branches/proto/v4/tools/quickbook/doc/html/quickbook/install/linux.html
   branches/proto/v4/tools/quickbook/doc/html/quickbook/install/macosx.html
   branches/proto/v4/tools/quickbook/doc/html/quickbook/install/windows.html
   branches/proto/v4/tools/quickbook/doc/html/quickbook/intro.html
   branches/proto/v4/tools/quickbook/doc/html/quickbook/ref.html
   branches/proto/v4/tools/quickbook/doc/html/quickbook/syntax.html
   branches/proto/v4/tools/quickbook/doc/html/quickbook/syntax/block.html
   branches/proto/v4/tools/quickbook/doc/html/quickbook/syntax/comments.html
   branches/proto/v4/tools/quickbook/doc/html/quickbook/syntax/phrase.html
Properties modified: 
   branches/proto/v4/   (props changed)
Text files modified: 
   branches/proto/v4/boost/archive/impl/archive_pointer_iserializer.ipp               |    13                                         
   branches/proto/v4/boost/archive/impl/archive_pointer_oserializer.ipp               |    15                                         
   branches/proto/v4/boost/archive/iterators/binary_from_base64.hpp                   |     2                                         
   branches/proto/v4/boost/archive/polymorphic_iarchive.hpp                           |    18                                         
   branches/proto/v4/boost/archive/polymorphic_oarchive.hpp                           |    18                                         
   branches/proto/v4/boost/config/abi/msvc_prefix.hpp                                 |    16                                         
   branches/proto/v4/boost/exception/exception.hpp                                    |     3                                         
   branches/proto/v4/boost/exception/get_error_info.hpp                               |    31                                         
   branches/proto/v4/boost/exception_ptr.hpp                                          |     2                                         
   branches/proto/v4/boost/filesystem/config.hpp                                      |     4                                         
   branches/proto/v4/boost/filesystem/convenience.hpp                                 |    13                                         
   branches/proto/v4/boost/filesystem/path.hpp                                        |     2                                         
   branches/proto/v4/boost/foreach.hpp                                                |     5                                         
   branches/proto/v4/boost/function/function_base.hpp                                 |     3                                         
   branches/proto/v4/boost/graph/is_straight_line_drawing.hpp                         |    28                                         
   branches/proto/v4/boost/graph/sloan_ordering.hpp                                   |    11                                         
   branches/proto/v4/boost/graph/topological_sort.hpp                                 |     2                                         
   branches/proto/v4/boost/math/special_functions/log1p.hpp                           |     2                                         
   branches/proto/v4/boost/math/tools/config.hpp                                      |     3                                         
   branches/proto/v4/boost/mpl/apply.hpp                                              |     6                                         
   branches/proto/v4/boost/mpl/apply_wrap.hpp                                         |     6                                         
   branches/proto/v4/boost/mpl/aux_/advance_backward.hpp                              |     6                                         
   branches/proto/v4/boost/mpl/aux_/advance_forward.hpp                               |     6                                         
   branches/proto/v4/boost/mpl/aux_/full_lambda.hpp                                   |     6                                         
   branches/proto/v4/boost/mpl/aux_/numeric_op.hpp                                    |     6                                         
   branches/proto/v4/boost/mpl/bind.hpp                                               |     6                                         
   branches/proto/v4/boost/mpl/unpack_args.hpp                                        |     6                                         
   branches/proto/v4/boost/pool/pool_alloc.hpp                                        |    77                                         
   branches/proto/v4/boost/proto/expr.hpp                                             |     6                                         
   branches/proto/v4/boost/python/call.hpp                                            |     6                                         
   branches/proto/v4/boost/python/call_method.hpp                                     |     6                                         
   branches/proto/v4/boost/python/detail/result.hpp                                   |     6                                         
   branches/proto/v4/boost/python/detail/target.hpp                                   |     6                                         
   branches/proto/v4/boost/python/object/make_holder.hpp                              |     6                                         
   branches/proto/v4/boost/python/object/pointer_holder.hpp                           |     6                                         
   branches/proto/v4/boost/python/object/value_holder.hpp                             |     6                                         
   branches/proto/v4/boost/python/signature.hpp                                       |     6                                         
   branches/proto/v4/boost/serialization/collection_traits.hpp                        |     8                                         
   branches/proto/v4/boost/serialization/detail/shared_count_132.hpp                  |     4                                         
   branches/proto/v4/boost/serialization/singleton.hpp                                |    10                                         
   branches/proto/v4/boost/spirit/home/phoenix/core/detail/function_eval.hpp          |    16                                         
   branches/proto/v4/boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_return.hpp |     6                                         
   branches/proto/v4/boost/spirit/home/phoenix/scope/detail/local_gen.hpp             |     4                                         
   branches/proto/v4/boost/spirit/home/phoenix/scope/detail/local_variable.hpp        |    25                                         
   branches/proto/v4/boost/spirit/home/phoenix/scope/local_variable.hpp               |     2                                         
   branches/proto/v4/boost/spirit/home/phoenix/stl/container/container.hpp            |     2                                         
   branches/proto/v4/boost/spirit/home/qi/string/tst.hpp                              |     2                                         
   branches/proto/v4/boost/thread/detail/move.hpp                                     |     4                                         
   branches/proto/v4/boost/thread/detail/thread.hpp                                   |     4                                         
   branches/proto/v4/boost/thread/pthread/recursive_mutex.hpp                         |     2                                         
   branches/proto/v4/boost/thread/pthread/shared_mutex.hpp                            |    46                                         
   branches/proto/v4/boost/tr1/array.hpp                                              |     7                                         
   branches/proto/v4/boost/tr1/random.hpp                                             |     7                                         
   branches/proto/v4/boost/tr1/regex.hpp                                              |     7                                         
   branches/proto/v4/boost/tr1/tuple.hpp                                              |     7                                         
   branches/proto/v4/boost/tr1/type_traits.hpp                                        |     9                                         
   branches/proto/v4/boost/tr1/unordered_map.hpp                                      |     7                                         
   branches/proto/v4/boost/tr1/unordered_set.hpp                                      |     7                                         
   branches/proto/v4/boost/xpressive/proto/expr.hpp                                   |     6                                         
   branches/proto/v4/boost/xpressive/regex_primitives.hpp                             |     3                                         
   branches/proto/v4/doc/Jamfile.v2                                                   |     3                                         
   branches/proto/v4/libs/conversion/lexical_cast.htm                                 |     6                                         
   branches/proto/v4/libs/exception/doc/source/boost-exception.reno                   |  5140 ++++++++++++++++++++--------------------
   branches/proto/v4/libs/exception/test/cloning_test.cpp                             |     9                                         
   branches/proto/v4/libs/exception/test/errno_test.cpp                               |     5                                         
   branches/proto/v4/libs/exception/test/error_info_test.cpp                          |    11                                         
   branches/proto/v4/libs/exception/test/unknown_exception_test.cpp                   |     5                                         
   branches/proto/v4/libs/filesystem/src/operations.cpp                               |     4                                         
   branches/proto/v4/libs/filesystem/test/Jamfile.v2                                  |    25                                         
   branches/proto/v4/libs/graph/build/Jamfile.v2                                      |    27                                         
   branches/proto/v4/libs/graph/test/Jamfile.v2                                       |     2                                         
   branches/proto/v4/libs/mpi/build/Jamfile.v2                                        |    12                                         
   branches/proto/v4/libs/numeric/ublas/test/placement_new.cpp                        |     1                                         
   branches/proto/v4/libs/pool/test/test_pool_alloc.cpp                               |    17                                         
   branches/proto/v4/libs/python/doc/building.html                                    |     2                                         
   branches/proto/v4/libs/python/doc/v2/CallPolicies.html                             |     2                                         
   branches/proto/v4/libs/regex/build/Jamfile.v2                                      |    34                                         
   branches/proto/v4/libs/serialization/build/Jamfile.v2                              |     3                                         
   branches/proto/v4/libs/serialization/src/extended_type_info.cpp                    |    27                                         
   branches/proto/v4/libs/serialization/src/extended_type_info_typeid.cpp             |    37                                         
   branches/proto/v4/libs/serialization/src/void_cast.cpp                             |    51                                         
   branches/proto/v4/libs/serialization/vc7ide/BoostSerializationLibrary.sln          |   242 +                                       
   branches/proto/v4/libs/serialization/vc7ide/Library.vcproj                         |     9                                         
   branches/proto/v4/libs/spirit/doc/lex/lexer_quickstart3.qbk                        |     2                                         
   branches/proto/v4/libs/spirit/doc/lex/tokens_values.qbk                            |     2                                         
   branches/proto/v4/libs/spirit/phoenix/test/algorithm/iteration.cpp                 |     2                                         
   branches/proto/v4/libs/spirit/phoenix/test/algorithm/querying.cpp                  |     2                                         
   branches/proto/v4/libs/spirit/phoenix/test/algorithm/querying2.cpp                 |     2                                         
   branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation1.cpp           |     2                                         
   branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation2.cpp           |     2                                         
   branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation3.cpp           |     2                                         
   branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation4.cpp           |     2                                         
   branches/proto/v4/libs/spirit/phoenix/test/bind/bind_function_object_tests.cpp     |     6                                         
   branches/proto/v4/libs/spirit/phoenix/test/container/container_tests.hpp           |     2                                         
   branches/proto/v4/libs/spirit/phoenix/test/operator/member.cpp                     |     4                                         
   branches/proto/v4/libs/spirit/phoenix/test/scope/bug_000008.cpp                    |     1                                         
   branches/proto/v4/libs/spirit/phoenix/test/scope/dynamic_tests.cpp                 |     2                                         
   branches/proto/v4/libs/system/src/error_code.cpp                                   |    46                                         
   branches/proto/v4/libs/system/test/Jamfile.v2                                      |     1                                         
   branches/proto/v4/libs/test/doc/html/utf/user-guide/fixture/global.html            |     2                                         
   branches/proto/v4/libs/thread/test/test_thread_move.cpp                            |    47                                         
   branches/proto/v4/libs/type_traits/doc/credits.qbk                                 |     2                                         
   branches/proto/v4/libs/utility/operators.htm                                       |     2                                         
   branches/proto/v4/status/explicit-failures-markup.xml                              |    15                                         
   branches/proto/v4/tools/boostbook/xsl/annotation.xsl                               |    24                                         
   branches/proto/v4/tools/boostbook/xsl/chunk-common.xsl                             |     2                                         
   branches/proto/v4/tools/boostbook/xsl/docbook.xsl                                  |     2                                         
   branches/proto/v4/tools/boostbook/xsl/lookup.xsl                                   |    87                                         
   branches/proto/v4/tools/build/v2/build/build-request.jam                           |    26                                         
   branches/proto/v4/tools/build/v2/index.html                                        |     2                                         
   branches/proto/v4/tools/build/v2/nightly.sh                                        |     2                                         
   branches/proto/v4/tools/build/v2/roll.sh                                           |     4                                         
   branches/proto/v4/tools/build/v2/tools/builtin.jam                                 |     1                                         
   branches/proto/v4/tools/build/v2/tools/darwin.jam                                  |     6                                         
   branches/proto/v4/tools/build/v2/tools/gcc.jam                                     |   171                                         
   branches/proto/v4/tools/build/v2/tools/types/exe.jam                               |     8                                         
   branches/proto/v4/tools/build/v2/tools/types/lib.jam                               |    24                                         
   branches/proto/v4/tools/build/v2/tools/types/obj.jam                               |     8                                         
   branches/proto/v4/tools/inspect/index.html                                         |     6                                         
   branches/proto/v4/tools/jam/doc/bjam.qbk                                           |     2                                         
   branches/proto/v4/tools/jam/src/builtins.c                                         |    15                                         
   branches/proto/v4/tools/jam/src/compile.c                                          |     8                                         
   branches/proto/v4/tools/jam/src/debug.c                                            |     2                                         
   branches/proto/v4/tools/jam/src/expand.c                                           |     6                                         
   branches/proto/v4/tools/jam/src/fileunix.c                                         |     4                                         
   branches/proto/v4/tools/jam/src/hash.c                                             |    17                                         
   branches/proto/v4/tools/jam/src/hcache.c                                           |     8                                         
   branches/proto/v4/tools/jam/src/hdrmacro.c                                         |     2                                         
   branches/proto/v4/tools/jam/src/headers.c                                          |     2                                         
   branches/proto/v4/tools/jam/src/jam.c                                              |    10                                         
   branches/proto/v4/tools/jam/src/make.c                                             |    15                                         
   branches/proto/v4/tools/jam/src/make1.c                                            |     6                                         
   branches/proto/v4/tools/jam/src/modules/order.c                                    |     2                                         
   branches/proto/v4/tools/jam/src/modules/property-set.c                             |     2                                         
   branches/proto/v4/tools/jam/src/output.c                                           |     2                                         
   branches/proto/v4/tools/jam/src/pathunix.c                                         |     2                                         
   branches/proto/v4/tools/jam/src/pwd.c                                              |    40                                         
   branches/proto/v4/tools/jam/src/regexp.c                                           |     2                                         
   branches/proto/v4/tools/jam/src/rules.c                                            |     2                                         
   branches/proto/v4/tools/jam/src/search.c                                           |     4                                         
   branches/proto/v4/tools/jam/src/timestamp.c                                        |     2                                         
   branches/proto/v4/tools/jam/src/variable.c                                         |     2                                         
   branches/proto/v4/tools/quickbook/doc/quickbook.qbk                                |    11                                         
   branches/proto/v4/tools/quickbook/extra/katepart/katepart.qbk                      |     6                                         
   branches/proto/v4/tools/quickbook/index.html                                       |     4                                         
   145 files changed, 3741 insertions(+), 3197 deletions(-)

Modified: branches/proto/v4/boost/archive/impl/archive_pointer_iserializer.ipp
==============================================================================
--- branches/proto/v4/boost/archive/impl/archive_pointer_iserializer.ipp	(original)
+++ branches/proto/v4/boost/archive/impl/archive_pointer_iserializer.ipp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -70,11 +70,16 @@
 template<class Archive>
 BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY())
 archive_pointer_iserializer<Archive>::~archive_pointer_iserializer(){
-    std::size_t count;
-    count = serialization::singleton<
+    if(! serialization::singleton<
             iserializer_map<Archive> 
-        >::get_mutable_instance().erase(this);
-    assert(count);
+        >::is_destroyed()
+    ){
+        std::size_t count;
+        count = serialization::singleton<
+                iserializer_map<Archive> 
+            >::get_mutable_instance().erase(this);
+        assert(count);
+    }
 }
 
 } // namespace detail

Modified: branches/proto/v4/boost/archive/impl/archive_pointer_oserializer.ipp
==============================================================================
--- branches/proto/v4/boost/archive/impl/archive_pointer_oserializer.ipp	(original)
+++ branches/proto/v4/boost/archive/impl/archive_pointer_oserializer.ipp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -70,11 +70,16 @@
 archive_pointer_oserializer<Archive>::~archive_pointer_oserializer(){
     // note: we need to check that the map still exists as we can't depend
     // on static variables being constructed in a specific sequence
-    unsigned int count;
-    count = serialization::singleton<
-            oserializer_map<Archive>
-        >::get_mutable_instance().erase(this);
-    assert(count);
+    if(! serialization::singleton<
+            oserializer_map<Archive> 
+        >::is_destroyed()
+    ){
+        unsigned int count;
+        count = serialization::singleton<
+                oserializer_map<Archive>
+            >::get_mutable_instance().erase(this);
+        assert(count);
+    }
 }
 
 } // namespace detail

Modified: branches/proto/v4/boost/archive/iterators/binary_from_base64.hpp
==============================================================================
--- branches/proto/v4/boost/archive/iterators/binary_from_base64.hpp	(original)
+++ branches/proto/v4/boost/archive/iterators/binary_from_base64.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -43,7 +43,7 @@
             -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
             -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
             -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,
-            52,53,54,55,56,57,58,59,60,61,-1,-1,-1, 0,-1,-1, // = 
+            52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1,
             -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,
             15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,
             -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,

Modified: branches/proto/v4/boost/archive/polymorphic_iarchive.hpp
==============================================================================
--- branches/proto/v4/boost/archive/polymorphic_iarchive.hpp	(original)
+++ branches/proto/v4/boost/archive/polymorphic_iarchive.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -42,13 +42,17 @@
 #if defined(BOOST_NO_INT64_T)
     #define BOOST_NO_INTRINSIC_INT64_T
 #else 
-    #if defined(ULONG_MAX)
-        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
-            #define BOOST_NO_INTRINSIC_INT64_T
-        #endif
-    #else 
-        #define BOOST_NO_INTRINSIC_INT64_T
-    #endif
+    #if defined(ULLONG_MAX)  
+        #if(ULONG_MAX == 18446744073709551615ul) // 2**64 - 1  
+            #define BOOST_NO_INTRINSIC_INT64_T  
+        #endif  
+    #elif defined(ULONG_MAX)  
+        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615ul) // 2**64 - 1  
+            #define BOOST_NO_INTRINSIC_INT64_T  
+        #endif  
+    #else   
+        #define BOOST_NO_INTRINSIC_INT64_T  
+    #endif  
 #endif
 
 namespace boost {

Modified: branches/proto/v4/boost/archive/polymorphic_oarchive.hpp
==============================================================================
--- branches/proto/v4/boost/archive/polymorphic_oarchive.hpp	(original)
+++ branches/proto/v4/boost/archive/polymorphic_oarchive.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -41,13 +41,17 @@
 #if defined(BOOST_NO_INT64_T)
     #define BOOST_NO_INTRINSIC_INT64_T
 #else 
-    #if defined(ULONG_MAX)
-        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
-            #define BOOST_NO_INTRINSIC_INT64_T
-        #endif
-    #else 
-        #define BOOST_NO_INTRINSIC_INT64_T
-    #endif
+    #if defined(ULLONG_MAX)  
+        #if(ULONG_MAX == 18446744073709551615ul) // 2**64 - 1  
+            #define BOOST_NO_INTRINSIC_INT64_T  
+        #endif  
+    #elif defined(ULONG_MAX)  
+        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615ul) // 2**64 - 1  
+            #define BOOST_NO_INTRINSIC_INT64_T  
+        #endif  
+    #else   
+        #define BOOST_NO_INTRINSIC_INT64_T  
+    #endif  
 #endif
 
 namespace boost {

Modified: branches/proto/v4/boost/config/abi/msvc_prefix.hpp
==============================================================================
--- branches/proto/v4/boost/config/abi/msvc_prefix.hpp	(original)
+++ branches/proto/v4/boost/config/abi/msvc_prefix.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -3,6 +3,20 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#pragma pack(push,8)
+//
+// Boost binaries are built with the compiler's default ABI settings,
+// if the user changes their default alignment in the VS IDE then their
+// code will no longer be binary compatible with the bjam built binaries
+// unless this header is included to force Boost code into a consistent ABI.
+//
+// Note that inclusion of this header is only necessary for libraries with 
+// separate source, header only libraries DO NOT need this as long as all
+// translation units are built with the same options.
+//
+#if defined(_M_X64)
+#  pragma pack(push,16)
+#else
+#  pragma pack(push,8)
+#endif
 
 

Modified: branches/proto/v4/boost/exception/exception.hpp
==============================================================================
--- branches/proto/v4/boost/exception/exception.hpp	(original)
+++ branches/proto/v4/boost/exception/exception.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -313,7 +313,8 @@
     exception_detail::enable_error_info_return_type<T>::type
     enable_error_info( T const & x )
         {
-        return typename exception_detail::enable_error_info_return_type<T>::type(x);
+        typedef typename exception_detail::enable_error_info_return_type<T>::type rt;
+        return rt(x);
         }
 
     ////////////////////////////////////////////////////////////////////////

Modified: branches/proto/v4/boost/exception/get_error_info.hpp
==============================================================================
--- branches/proto/v4/boost/exception/get_error_info.hpp	(original)
+++ branches/proto/v4/boost/exception/get_error_info.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -10,7 +10,6 @@
 #include <boost/exception/detail/error_info_impl.hpp>
 #include <boost/exception/detail/type_info.hpp>
 #include <boost/shared_ptr.hpp>
-#include <string.h>
 
 namespace
 boost
@@ -21,30 +20,20 @@
         struct
         strwrap
             {
-            char const * str;
+			std::string str;
+            char const * ptr;
+
+            explicit
             strwrap( char const * s ):
-                str(init(s))
-                {
-                }
-            ~strwrap()
+                str(s),
+                ptr(&str[0])
                 {
-                delete[] str;
                 }
 
             private:
 
             strwrap( strwrap const & );
             strwrap & operator=( strwrap const & );
-
-            static
-            char const *
-            init( char const * s )
-                {
-                size_t n=1+strlen(s);
-                char * str = new char[n];
-                (void) memcpy(str,s,n);
-                return str;
-                }
             };
 
         template <>
@@ -55,10 +44,10 @@
             shared_ptr<char const * const>
             get( exception const & x )
                 {
-                if( x.throw_function_ )
+                if( x.throw_function_ && *x.throw_function_ )
                     {
                     shared_ptr<strwrap> s(new strwrap(x.throw_function_));
-                    return shared_ptr<char const *>(s,&s->str);
+                    return shared_ptr<char const *>(s,&s->ptr);
                     }
                 else
                     return shared_ptr<char const * const>();
@@ -73,10 +62,10 @@
             shared_ptr<char const * const>
             get( exception const & x )
                 {
-                if( x.throw_file_ )
+                if( x.throw_file_ && *x.throw_file_ )
                     {
                     shared_ptr<strwrap> s(new strwrap(x.throw_file_));
-                    return shared_ptr<char const *>(s,&s->str);
+                    return shared_ptr<char const *>(s,&s->ptr);
                     }
                 else
                     return shared_ptr<char const * const>();

Modified: branches/proto/v4/boost/exception_ptr.hpp
==============================================================================
--- branches/proto/v4/boost/exception_ptr.hpp	(original)
+++ branches/proto/v4/boost/exception_ptr.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -99,7 +99,7 @@
 
         private:
 
-        clone_base const *
+		exception_detail::clone_base const *
         clone() const
             {
             return new unknown_exception(*this);

Modified: branches/proto/v4/boost/filesystem/config.hpp
==============================================================================
--- branches/proto/v4/boost/filesystem/config.hpp	(original)
+++ branches/proto/v4/boost/filesystem/config.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -60,13 +60,13 @@
 
 //  narrow support only for badly broken compilers or libraries  -------------//
 
-# if defined(BOOST_NO_STD_WSTRING) || defined(BOOST_NO_SFINAE) || defined(BOOST_NO_STD_LOCALE) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
+# if defined(BOOST_NO_STD_WSTRING) || defined(BOOST_NO_SFINAE) || defined(BOOST_NO_STD_LOCALE) || BOOST_WORKAROUND(__BORLANDC__, <0x610)
 #   define BOOST_FILESYSTEM_NARROW_ONLY
 # endif
 
 //  enable dynamic linking on Windows  ---------------------------------------//
 
-#  if (defined(BOOST_ALL_DYN_LINK) || defined(BOOST_FILESYSTEM_DYN_LINK)) && defined(__BORLANDC__) && defined(__WIN32__)
+#  if (defined(BOOST_ALL_DYN_LINK) || defined(BOOST_FILESYSTEM_DYN_LINK)) &&  BOOST_WORKAROUND(__BORLANDC__, <0x610) && defined(__WIN32__)
 #    error Dynamic linking Boost.Filesystem does not work for Borland; use static linking instead
 #  endif
 

Modified: branches/proto/v4/boost/filesystem/convenience.hpp
==============================================================================
--- branches/proto/v4/boost/filesystem/convenience.hpp	(original)
+++ branches/proto/v4/boost/filesystem/convenience.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -241,10 +241,23 @@
       else if ( is_directory( m_imp->m_stack.top()->status() ) )
       {
         system::error_code ec;
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+        if( m_imp->m_no_throw ) {
+            m_imp->m_stack.push(
+                basic_directory_iterator<Path>( *m_imp->m_stack.top(), ec )
+            );
+        }
+        else {
+            m_imp->m_stack.push(
+                basic_directory_iterator<Path>( *m_imp->m_stack.top() )
+            );
+        }
+#else
         m_imp->m_stack.push(
           m_imp->m_no_throw
             ? basic_directory_iterator<Path>( *m_imp->m_stack.top(), ec )
             : basic_directory_iterator<Path>( *m_imp->m_stack.top() ) );
+#endif
         if ( m_imp->m_stack.top() != end_itr )
         {
           ++m_imp->m_level;

Modified: branches/proto/v4/boost/filesystem/path.hpp
==============================================================================
--- branches/proto/v4/boost/filesystem/path.hpp	(original)
+++ branches/proto/v4/boost/filesystem/path.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -533,7 +533,7 @@
     //  inserters and extractors  --------------------------------------------//
 
 // bypass VC++ 7.0 and earlier, and broken Borland compilers
-# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) && !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) && !BOOST_WORKAROUND(__BORLANDC__, < 0x610)
     template< class Path >
     std::basic_ostream< typename Path::string_type::value_type,
       typename Path::string_type::traits_type > &

Modified: branches/proto/v4/boost/foreach.hpp
==============================================================================
--- branches/proto/v4/boost/foreach.hpp	(original)
+++ branches/proto/v4/boost/foreach.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -39,7 +39,7 @@
 // These compilers make it impossible to for BOOST_FOREACH to detect
 // temporaries and avoid reevaluation of the collection expression.
 # if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)                                                      \
-  || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))                                     \
+  || BOOST_WORKAROUND(__BORLANDC__, < 0x593)                                                    \
   || (BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, <= 700) && defined(_MSC_VER))                   \
   || BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x570))                                      \
   || BOOST_WORKAROUND(__DECCXX_VER, <= 60590042)
@@ -55,7 +55,8 @@
   || (BOOST_WORKAROUND(__GNUC__, == 3) && (__GNUC_MINOR__ <= 2))                                \
   || (BOOST_WORKAROUND(__GNUC__, == 3) && (__GNUC_MINOR__ <= 3) && defined(__APPLE_CC__))       \
   || BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600))                                         \
-  || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3206))
+  || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3206))                                      \
+  || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x590))
 #  define BOOST_FOREACH_NO_CONST_RVALUE_DETECTION
 # else
 #  define BOOST_FOREACH_RUN_TIME_CONST_RVALUE_DETECTION

Modified: branches/proto/v4/boost/function/function_base.hpp
==============================================================================
--- branches/proto/v4/boost/function/function_base.hpp	(original)
+++ branches/proto/v4/boost/function/function_base.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -22,6 +22,7 @@
 #include <boost/type_traits/is_integral.hpp>
 #include <boost/type_traits/is_volatile.hpp>
 #include <boost/type_traits/composite_traits.hpp>
+#include <boost/type_traits/ice.hpp>
 #include <boost/ref.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/detail/workaround.hpp>
@@ -66,7 +67,7 @@
 #  define BOOST_FUNCTION_TARGET_FIX(x)
 #endif // not MSVC
 
-#if !BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x5A0)
 #  define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type)              \
       typename ::boost::enable_if_c<(::boost::type_traits::ice_not<          \
                             (::boost::is_integral<Functor>::value)>::value), \

Modified: branches/proto/v4/boost/graph/is_straight_line_drawing.hpp
==============================================================================
--- branches/proto/v4/boost/graph/is_straight_line_drawing.hpp	(original)
+++ branches/proto/v4/boost/graph/is_straight_line_drawing.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -164,7 +164,7 @@
         edge_t e(get<0>(*itr));
         vertex_t source_v(source(e,g));
         vertex_t target_v(target(e,g));
-        if (drawing[source_v].x > drawing[target_v].x)
+        if (drawing[source_v].y > drawing[target_v].y)
           std::swap(source_v, target_v);
 
         active_map_key_t key(get(drawing, source_v).y,
@@ -187,12 +187,32 @@
               before = prior(a_itr);
             after = next(a_itr);
 
-            if (after != active_edges.end() || before != active_edges.end())
+	    if (before != active_edges.end())
               {
                 
-                edge_t f = after != active_edges.end() ? 
-                  after->second : before->second;
+                edge_t f = before->second;
+                vertex_t e_source(source(e,g));
+                vertex_t e_target(target(e,g));
+                vertex_t f_source(source(f,g));
+                vertex_t f_target(target(f,g));
 
+                if (intersects(drawing[e_source].x, 
+                               drawing[e_source].y,
+                               drawing[e_target].x,
+                               drawing[e_target].y,
+                               drawing[f_source].x, 
+                               drawing[f_source].y,
+                               drawing[f_target].x,
+                               drawing[f_target].y
+                               )
+                    )
+                  return false;
+              }
+
+            if (after != active_edges.end())
+              {
+                
+                edge_t f = after->second;
                 vertex_t e_source(source(e,g));
                 vertex_t e_target(target(e,g));
                 vertex_t f_source(source(f,g));

Modified: branches/proto/v4/boost/graph/sloan_ordering.hpp
==============================================================================
--- branches/proto/v4/boost/graph/sloan_ordering.hpp	(original)
+++ branches/proto/v4/boost/graph/sloan_ordering.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -14,19 +14,18 @@
 
 #define WEIGHT1 1               //default weight for the distance in the Sloan algorithm
 #define WEIGHT2 2               //default weight for the degree in the Sloan algorithm
-#define MAXINT 2147483647       //Maximum value for a 32bit integer
 
 #include <boost/config.hpp>
 #include <vector>
 #include <queue>
+#include <algorithm>
+#include <limits>
 #include <boost/pending/queue.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/breadth_first_search.hpp>
 #include <boost/graph/properties.hpp>
 #include <boost/pending/indirect_cmp.hpp>
 #include <boost/property_map.hpp>
-#include <algorithm>
-#include <utility>
 #include <boost/graph/visitors.hpp>
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/cuthill_mckee_ordering.hpp>
@@ -195,9 +194,9 @@
       //end 3 & 4
 
       
-      //step 5
-      //Initializing w
-      w_e = MAXINT;
+      // step 5
+      // Initializing w
+      w_e = std::numeric_limits<unsigned>::max();
       //end 5
       
       

Modified: branches/proto/v4/boost/graph/topological_sort.hpp
==============================================================================
--- branches/proto/v4/boost/graph/topological_sort.hpp	(original)
+++ branches/proto/v4/boost/graph/topological_sort.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -37,7 +37,7 @@
       : m_iter(_iter) { }
     
     template <typename Edge, typename Graph>
-    void back_edge(const Edge& u, Graph&) { throw not_a_dag(); }
+    void back_edge(const Edge&, Graph&) { throw not_a_dag(); }
     
     template <typename Vertex, typename Graph> 
     void finish_vertex(const Vertex& u, Graph&) { *m_iter++ = u; }

Modified: branches/proto/v4/boost/math/special_functions/log1p.hpp
==============================================================================
--- branches/proto/v4/boost/math/special_functions/log1p.hpp	(original)
+++ branches/proto/v4/boost/math/special_functions/log1p.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -330,6 +330,7 @@
          "log1p<%1%>(%1%)", 0, pol);
    return ::log1pf(x); 
 }
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
 template <class Policy>
 inline long double log1p(long double x, const Policy& pol)
 { 
@@ -341,6 +342,7 @@
          "log1p<%1%>(%1%)", 0, pol);
    return ::log1pl(x); 
 }
+#endif
 #else
 template <class Policy>
 inline float log1p(float x, const Policy& pol)

Modified: branches/proto/v4/boost/math/tools/config.hpp
==============================================================================
--- branches/proto/v4/boost/math/tools/config.hpp	(original)
+++ branches/proto/v4/boost/math/tools/config.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -23,7 +23,8 @@
 #include <boost/math/tools/user.hpp>
 #include <boost/math/special_functions/detail/round_fwd.hpp>
 
-#if defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__hppa)
+#if defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) \
+   || defined(__hppa) || defined(__NO_LONG_DOUBLE_MATH)
 #  define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
 #endif
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x582))

Modified: branches/proto/v4/boost/mpl/apply.hpp
==============================================================================
--- branches/proto/v4/boost/mpl/apply.hpp	(original)
+++ branches/proto/v4/boost/mpl/apply.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -135,7 +135,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 #   define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -222,4 +225,5 @@
 
 #   undef i_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/proto/v4/boost/mpl/apply_wrap.hpp
==============================================================================
--- branches/proto/v4/boost/mpl/apply_wrap.hpp	(original)
+++ branches/proto/v4/boost/mpl/apply_wrap.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -78,7 +78,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 #   define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -197,4 +200,5 @@
 
 #   undef j_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/proto/v4/boost/mpl/aux_/advance_backward.hpp
==============================================================================
--- branches/proto/v4/boost/mpl/aux_/advance_backward.hpp	(original)
+++ branches/proto/v4/boost/mpl/aux_/advance_backward.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -79,7 +79,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 #define i_ BOOST_PP_FRAME_ITERATION(1)
 
 template<>
@@ -121,4 +124,5 @@
 #   undef AUX778076_ITER_1
 #   undef AUX778076_ITER_0
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/proto/v4/boost/mpl/aux_/advance_forward.hpp
==============================================================================
--- branches/proto/v4/boost/mpl/aux_/advance_forward.hpp	(original)
+++ branches/proto/v4/boost/mpl/aux_/advance_forward.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -79,7 +79,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 #define i_ BOOST_PP_FRAME_ITERATION(1)
 
 template<>
@@ -120,4 +123,5 @@
 #   undef AUX778076_ITER_1
 #   undef AUX778076_ITER_0
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/proto/v4/boost/mpl/aux_/full_lambda.hpp
==============================================================================
--- branches/proto/v4/boost/mpl/aux_/full_lambda.hpp	(original)
+++ branches/proto/v4/boost/mpl/aux_/full_lambda.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -227,7 +227,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 #define i_ BOOST_PP_FRAME_ITERATION(1)
 
 #if i_ > 0
@@ -347,4 +350,5 @@
 };
 
 #undef i_
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/proto/v4/boost/mpl/aux_/numeric_op.hpp
==============================================================================
--- branches/proto/v4/boost/mpl/aux_/numeric_op.hpp	(original)
+++ branches/proto/v4/boost/mpl/aux_/numeric_op.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -287,7 +287,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 #   define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -308,4 +311,5 @@
 
 #   undef i_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/proto/v4/boost/mpl/bind.hpp
==============================================================================
--- branches/proto/v4/boost/mpl/bind.hpp	(original)
+++ branches/proto/v4/boost/mpl/bind.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -361,7 +361,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 #   define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -544,4 +547,5 @@
 #   endif
 #   undef j_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/proto/v4/boost/mpl/unpack_args.hpp
==============================================================================
--- branches/proto/v4/boost/mpl/unpack_args.hpp	(original)
+++ branches/proto/v4/boost/mpl/unpack_args.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -111,7 +111,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 #   define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -143,4 +146,5 @@
 
 #   undef i_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/proto/v4/boost/pool/pool_alloc.hpp
==============================================================================
--- branches/proto/v4/boost/pool/pool_alloc.hpp	(original)
+++ branches/proto/v4/boost/pool/pool_alloc.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -14,6 +14,7 @@
 // new, std::bad_alloc
 #include <new>
 
+#include <boost/throw_exception.hpp>
 #include <boost/pool/poolfwd.hpp>
 
 // boost::singleton_pool
@@ -57,7 +58,15 @@
     };
 
   public:
-    pool_allocator() { }
+    pool_allocator()
+    {
+      // Required to ensure construction of singleton_pool IFF an
+      // instace of this allocator is constructed during global
+      // initialization. See ticket #2359 for a complete explaination
+      // ( http://svn.boost.org/trac/boost/ticket/2359 )
+      singleton_pool<pool_allocator_tag, sizeof(T), UserAllocator, Mutex,
+	             NextSize>::is_from(0);
+    }
 
     // default copy constructor
 
@@ -66,7 +75,14 @@
     // not explicit, mimicking std::allocator [20.4.1]
     template <typename U>
     pool_allocator(const pool_allocator<U, UserAllocator, Mutex, NextSize> &)
-    { }
+    {
+      // Required to ensure construction of singleton_pool IFF an
+      // instace of this allocator is constructed during global
+      // initialization. See ticket #2359 for a complete explaination
+      // ( http://svn.boost.org/trac/boost/ticket/2359 )
+      singleton_pool<pool_allocator_tag, sizeof(T), UserAllocator, Mutex,
+	             NextSize>::is_from(0);
+    }
 
     // default destructor
 
@@ -95,7 +111,7 @@
           singleton_pool<pool_allocator_tag, sizeof(T), UserAllocator, Mutex,
               NextSize>::ordered_malloc(n) );
       if (ret == 0)
-        throw std::bad_alloc();
+        boost::throw_exception(std::bad_alloc());
       return ret;
     }
     static pointer allocate(const size_type n, const void * const)
@@ -111,6 +127,21 @@
     }
 };
 
+template<
+    typename UserAllocator,
+    typename Mutex,
+    unsigned NextSize>
+class pool_allocator<void, UserAllocator, Mutex, NextSize>
+{
+public:
+    typedef void*       pointer;
+    typedef const void* const_pointer;
+    typedef void        value_type;
+    template <class U> struct rebind {
+	typedef pool_allocator<U, UserAllocator, Mutex, NextSize> other;
+    };
+};
+
 struct fast_pool_allocator_tag { };
 
 template <typename T,
@@ -139,8 +170,16 @@
     };
 
   public:
-    fast_pool_allocator() { }
-
+    fast_pool_allocator()
+    {
+      // Required to ensure construction of singleton_pool IFF an
+      // instace of this allocator is constructed during global
+      // initialization. See ticket #2359 for a complete explaination
+      // ( http://svn.boost.org/trac/boost/ticket/2359 )
+      singleton_pool<fast_pool_allocator_tag, sizeof(T),
+	             UserAllocator, Mutex, NextSize>::is_from(0);
+    }
+    
     // default copy constructor
 
     // default assignment operator
@@ -149,7 +188,14 @@
     template <typename U>
     fast_pool_allocator(
         const fast_pool_allocator<U, UserAllocator, Mutex, NextSize> &)
-    { }
+    {
+      // Required to ensure construction of singleton_pool IFF an
+      // instace of this allocator is constructed during global
+      // initialization. See ticket #2359 for a complete explaination
+      // ( http://svn.boost.org/trac/boost/ticket/2359 )
+      singleton_pool<fast_pool_allocator_tag, sizeof(T),
+	             UserAllocator, Mutex, NextSize>::is_from(0);
+    }
 
     // default destructor
 
@@ -182,7 +228,7 @@
               singleton_pool<fast_pool_allocator_tag, sizeof(T),
                   UserAllocator, Mutex, NextSize>::ordered_malloc(n) );
       if (ret == 0)
-        throw std::bad_alloc();
+	boost::throw_exception(std::bad_alloc());
       return ret;
     }
     static pointer allocate(const size_type n, const void * const)
@@ -193,7 +239,7 @@
           singleton_pool<fast_pool_allocator_tag, sizeof(T),
               UserAllocator, Mutex, NextSize>::malloc() );
       if (ret == 0)
-        throw std::bad_alloc();
+	boost::throw_exception(std::bad_alloc());
       return ret;
     }
     static void deallocate(const pointer ptr, const size_type n)
@@ -216,6 +262,21 @@
     }
 };
 
+template<
+    typename UserAllocator,
+    typename Mutex,
+    unsigned NextSize>
+class fast_pool_allocator<void, UserAllocator, Mutex, NextSize>
+{
+public:
+    typedef void*       pointer;
+    typedef const void* const_pointer;
+    typedef void        value_type;
+    template <class U> struct rebind {
+	typedef fast_pool_allocator<U, UserAllocator, Mutex, NextSize> other;
+    };
+};
+
 } // namespace boost
 
 #endif

Modified: branches/proto/v4/boost/proto/expr.hpp
==============================================================================
--- branches/proto/v4/boost/proto/expr.hpp	(original)
+++ branches/proto/v4/boost/proto/expr.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -146,7 +146,10 @@
 
     #endif // BOOST_PROTO_EXPR_HPP_EAN_04_01_2005
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
     #define ARG_COUNT BOOST_PP_MAX(1, BOOST_PP_ITERATION())
     #define IS_TERMINAL 0 == BOOST_PP_ITERATION()
@@ -477,4 +480,5 @@
 
     #undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif

Modified: branches/proto/v4/boost/python/call.hpp
==============================================================================
--- branches/proto/v4/boost/python/call.hpp	(original)
+++ branches/proto/v4/boost/python/call.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -38,7 +38,10 @@
 
 # endif // CALL_DWA2002411_HPP
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100)                      \
         && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
 #  line BOOST_PP_LINE(__LINE__, call.hpp)
@@ -76,4 +79,5 @@
 
 # undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif

Modified: branches/proto/v4/boost/python/call_method.hpp
==============================================================================
--- branches/proto/v4/boost/python/call_method.hpp	(original)
+++ branches/proto/v4/boost/python/call_method.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -37,7 +37,10 @@
 
 # endif // CALL_METHOD_DWA2002411_HPP
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100)                      \
         && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
 #  line BOOST_PP_LINE(__LINE__, call_method.hpp)
@@ -76,4 +79,5 @@
 
 # undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/proto/v4/boost/python/detail/result.hpp
==============================================================================
--- branches/proto/v4/boost/python/detail/result.hpp	(original)
+++ branches/proto/v4/boost/python/detail/result.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -86,7 +86,10 @@
 # endif // RESULT_DWA2002521_HPP
 
 /* --------------- function pointers --------------- */
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100)                      \
         && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
 #  line BOOST_PP_LINE(__LINE__, result.hpp(function pointers))
@@ -128,4 +131,5 @@
 # undef N
 # undef Q
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif

Modified: branches/proto/v4/boost/python/detail/target.hpp
==============================================================================
--- branches/proto/v4/boost/python/detail/target.hpp	(original)
+++ branches/proto/v4/boost/python/detail/target.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -37,7 +37,10 @@
 # endif // TARGET_DWA2002521_HPP
 
 /* --------------- function pointers --------------- */
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100)                      \
         && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
 #  line BOOST_PP_LINE(__LINE__, target.hpp(function_pointers))
@@ -79,4 +82,5 @@
 # undef N
 # undef Q
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif

Modified: branches/proto/v4/boost/python/object/make_holder.hpp
==============================================================================
--- branches/proto/v4/boost/python/object/make_holder.hpp	(original)
+++ branches/proto/v4/boost/python/object/make_holder.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -47,7 +47,10 @@
 
 # endif // MAKE_HOLDER_DWA20011215_HPP
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100)                      \
         && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
 #  line BOOST_PP_LINE(__LINE__, make_holder.hpp)
@@ -102,4 +105,5 @@
 
 # undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif

Modified: branches/proto/v4/boost/python/object/pointer_holder.hpp
==============================================================================
--- branches/proto/v4/boost/python/object/pointer_holder.hpp	(original)
+++ branches/proto/v4/boost/python/object/pointer_holder.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -170,7 +170,10 @@
 # endif // POINTER_HOLDER_DWA20011215_HPP
 
 /* --------------- pointer_holder --------------- */
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1
 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100)                      \
         && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
 #  line BOOST_PP_LINE(__LINE__, pointer_holder.hpp)
@@ -212,4 +215,5 @@
 
 # undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif

Modified: branches/proto/v4/boost/python/object/value_holder.hpp
==============================================================================
--- branches/proto/v4/boost/python/object/value_holder.hpp	(original)
+++ branches/proto/v4/boost/python/object/value_holder.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -117,7 +117,10 @@
 
 // --------------- value_holder ---------------
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1
 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100)                      \
         && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
 #  line BOOST_PP_LINE(__LINE__, value_holder.hpp(value_holder))
@@ -163,4 +166,5 @@
 
 # undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif

Modified: branches/proto/v4/boost/python/signature.hpp
==============================================================================
--- branches/proto/v4/boost/python/signature.hpp	(original)
+++ branches/proto/v4/boost/python/signature.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -113,7 +113,10 @@
 
 # endif // SIGNATURE_JDG20020813_HPP
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1 // defined(BOOST_PP_IS_ITERATING)
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1 // defined(BOOST_PP_IS_ITERATING)
 
 # define N BOOST_PP_ITERATION()
 
@@ -176,4 +179,5 @@
 # undef Q
 # undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // !defined(BOOST_PP_IS_ITERATING)

Modified: branches/proto/v4/boost/serialization/collection_traits.hpp
==============================================================================
--- branches/proto/v4/boost/serialization/collection_traits.hpp	(original)
+++ branches/proto/v4/boost/serialization/collection_traits.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -54,8 +54,12 @@
 #if defined(BOOST_NO_INT64_T)  
      #define BOOST_NO_INTRINSIC_INT64_T  
 #else   
-    #if defined(ULONG_MAX)  
-        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1  
+    #if defined(ULLONG_MAX)  
+        #if(ULONG_MAX == 18446744073709551615ul) // 2**64 - 1  
+            #define BOOST_NO_INTRINSIC_INT64_T  
+        #endif  
+    #elif defined(ULONG_MAX)  
+        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615ul) // 2**64 - 1  
             #define BOOST_NO_INTRINSIC_INT64_T  
         #endif  
     #else   

Modified: branches/proto/v4/boost/serialization/detail/shared_count_132.hpp
==============================================================================
--- branches/proto/v4/boost/serialization/detail/shared_count_132.hpp	(original)
+++ branches/proto/v4/boost/serialization/detail/shared_count_132.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -292,12 +292,12 @@
 
     void * operator new(std::size_t)
     {
-        return quick_allocator<this_type>::alloc();
+        return boost::detail::quick_allocator<this_type>::alloc();
     }
 
     void operator delete(void * p)
     {
-        quick_allocator<this_type>::dealloc(p);
+        boost::detail::quick_allocator<this_type>::dealloc(p);
     }
 
 #endif

Modified: branches/proto/v4/boost/serialization/singleton.hpp
==============================================================================
--- branches/proto/v4/boost/serialization/singleton.hpp	(original)
+++ branches/proto/v4/boost/serialization/singleton.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -97,6 +97,7 @@
 class singleton : public singleton_module
 {
 private:
+    static bool m_is_destroyed;
     BOOST_DLLEXPORT static T & instance;
     // include this to provoke instantiation at pre-execution time
     static void use(T const &) {}
@@ -104,11 +105,11 @@
         static T t;
         // refer to instance, causing it to be instantiated (and
         // initialized at startup on working compilers)
+        assert(! m_is_destroyed);
         use(instance);
         return t;
     }
 public:
-    static bool is_destroyed;
     BOOST_DLLEXPORT static T & get_mutable_instance(){
         assert(! is_locked());
         return get_instance();
@@ -116,8 +117,11 @@
     BOOST_DLLEXPORT static const T & get_const_instance(){
         return get_instance();
     }
+    BOOST_DLLEXPORT static bool is_destroyed(){
+        return m_is_destroyed;
+    }
     ~singleton(){
-        is_destroyed = true;
+        m_is_destroyed = true;
     }
 };
 
@@ -125,7 +129,7 @@
 BOOST_DLLEXPORT T & singleton<T>::instance = singleton<T>::get_instance();
 
 template<class T>
-bool singleton<T>::is_destroyed = false;
+bool singleton<T>::m_is_destroyed = false;
 
 } // namespace serialization
 } // namespace boost

Modified: branches/proto/v4/boost/spirit/home/phoenix/core/detail/function_eval.hpp
==============================================================================
--- branches/proto/v4/boost/spirit/home/phoenix/core/detail/function_eval.hpp	(original)
+++ branches/proto/v4/boost/spirit/home/phoenix/core/detail/function_eval.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -32,8 +32,12 @@
         template <typename Env, typename F>
         struct result
         {
-            typedef typename F::template result<Env>::type function;
-            typedef typename function::result_type type;
+            typedef typename
+                remove_reference<
+                    typename F::template result<Env>::type 
+                >::type
+            fn;
+            typedef typename fn::result_type type;
         };
 
         template <typename RT, typename Env, typename F>
@@ -96,7 +100,11 @@
           , BOOST_PP_ENUM_PARAMS(N, typename A)>
         struct result
         {
-            typedef typename F::template result<Env>::type function;
+            typedef typename
+                remove_reference<
+                    typename F::template result<Env>::type 
+                >::type
+            fn;
             BOOST_PP_REPEAT(N, PHOENIX_GET_ARG, _)
 
             typedef BOOST_PP_CAT(mpl::vector, N)
@@ -104,7 +112,7 @@
             args;
 
             typedef typename
-                function::template result<BOOST_PP_ENUM_PARAMS(N, a)>
+                fn::template result<BOOST_PP_ENUM_PARAMS(N, a)>
             function_apply;
 
             typedef typename

Modified: branches/proto/v4/boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_return.hpp
==============================================================================
--- branches/proto/v4/boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_return.hpp	(original)
+++ branches/proto/v4/boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_return.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -25,6 +25,12 @@
     {
         typedef Ret type;
     };
+    
+    template<typename Ret, typename Class>
+    struct mem_fun_ptr_return<Ret (Class::*)() const>
+    {
+        typedef Ret type;
+    };
 
 #define BOOST_PP_ITERATION_PARAMS_1                                                           \
         (3, (1, PHOENIX_MEMBER_LIMIT, "boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_return.hpp"))

Modified: branches/proto/v4/boost/spirit/home/phoenix/scope/detail/local_gen.hpp
==============================================================================
--- branches/proto/v4/boost/spirit/home/phoenix/scope/detail/local_gen.hpp	(original)
+++ branches/proto/v4/boost/spirit/home/phoenix/scope/detail/local_gen.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -5,8 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#ifndef PHOENIX_SCOPE_DETAIL_LOCAL_GEN_HPP
-#define PHOENIX_SCOPE_DETAIL_LOCAL_GEN_HPP
+// Allow multiple inclusion. let.hpp and lambda.hpp will have the guards
 
 #include <boost/preprocessor/iterate.hpp>
 #include <boost/preprocessor/repetition/enum.hpp>
@@ -26,7 +25,6 @@
 
 #undef PHOENIX_LOCAL_GEN_PARAM
 #undef PHOENIX_LOCAL_GEN_ACTOR
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 //

Modified: branches/proto/v4/boost/spirit/home/phoenix/scope/detail/local_variable.hpp
==============================================================================
--- branches/proto/v4/boost/spirit/home/phoenix/scope/detail/local_variable.hpp	(original)
+++ branches/proto/v4/boost/spirit/home/phoenix/scope/detail/local_variable.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -21,7 +21,6 @@
 #include <boost/preprocessor/repeat.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <boost/type_traits/is_reference.hpp>
-#include <boost/spirit/home/phoenix/detail/local_reference.hpp>
 
 #define PHOENIX_MAP_LOCAL_TEMPLATE_PARAM(z, n, data) \
     typename T##n = unused<n>
@@ -109,35 +108,13 @@
             type;
         };
 
-        template <typename T>
-        struct local_reference_identity
-        {
-            typedef local_reference<T> type;
-        };
-
-        template <typename Locals, typename Index>
-        struct make_local_reference
-        {
-            typedef typename
-                fusion::result_of::value_at<Locals, Index>::type
-            value_at;
-
-            typedef typename
-                mpl::eval_if<
-                    is_reference<value_at>
-                  , mpl::identity<value_at>
-                  , local_reference_identity<value_at>
-                >::type
-            type;
-        };
-
         template <typename Locals, typename Index>
         struct get_local_or_void
         {
             typedef typename
                 mpl::eval_if<
                     mpl::less<Index, mpl::size<Locals> >
-                  , make_local_reference<Locals, Index>
+                  , fusion::result_of::at<Locals, Index>
                   , mpl::identity<fusion::void_>
                 >::type
             type;

Modified: branches/proto/v4/boost/spirit/home/phoenix/scope/local_variable.hpp
==============================================================================
--- branches/proto/v4/boost/spirit/home/phoenix/scope/local_variable.hpp	(original)
+++ branches/proto/v4/boost/spirit/home/phoenix/scope/local_variable.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -36,7 +36,7 @@
         struct result : detail::apply_local<local_variable<Key>, Env> {};
 
         template <typename Env>
-        typename result<Env>::type const
+        typename result<Env>::type 
         eval(Env const& env) const
         {
             typedef typename result<Env>::type return_type;

Modified: branches/proto/v4/boost/spirit/home/phoenix/stl/container/container.hpp
==============================================================================
--- branches/proto/v4/boost/spirit/home/phoenix/stl/container/container.hpp	(original)
+++ branches/proto/v4/boost/spirit/home/phoenix/stl/container/container.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -268,7 +268,7 @@
                 typedef
                     boost::mpl::eval_if<
                         boost::is_same<Arg1, typename iterator_of<C>::type>
-#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1400)
+#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1500)
                       , iterator_of<C>
 #else
                       , boost::mpl::identity<void>

Modified: branches/proto/v4/boost/spirit/home/qi/string/tst.hpp
==============================================================================
--- branches/proto/v4/boost/spirit/home/qi/string/tst.hpp	(original)
+++ branches/proto/v4/boost/spirit/home/qi/string/tst.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -84,7 +84,7 @@
         template <typename F>
         void for_each(F f) const
         {
-            node::for_each(root, "", f);
+            node::for_each(root, std::basic_string<Char>(), f);
         }
 
     private:

Modified: branches/proto/v4/boost/thread/detail/move.hpp
==============================================================================
--- branches/proto/v4/boost/thread/detail/move.hpp	(original)
+++ branches/proto/v4/boost/thread/detail/move.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -41,9 +41,9 @@
 
 #ifndef BOOST_NO_SFINAE
     template<typename T>
-    typename enable_if<boost::is_convertible<T&,detail::thread_move_t<T> >, detail::thread_move_t<T> >::type move(T& t)
+    typename enable_if<boost::is_convertible<T&,detail::thread_move_t<T> >, T >::type move(T& t)
     {
-        return t;
+        return T(detail::thread_move_t<T>(t));
     }
 #endif
     

Modified: branches/proto/v4/boost/thread/detail/thread.hpp
==============================================================================
--- branches/proto/v4/boost/thread/detail/thread.hpp	(original)
+++ branches/proto/v4/boost/thread/detail/thread.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -339,9 +339,9 @@
         return t;
     }
 #else
-    inline detail::thread_move_t<thread> move(detail::thread_move_t<thread> t)
+    inline thread move(detail::thread_move_t<thread> t)
     {
-        return t;
+        return thread(t);
     }
 #endif
 

Modified: branches/proto/v4/boost/thread/pthread/recursive_mutex.hpp
==============================================================================
--- branches/proto/v4/boost/thread/pthread/recursive_mutex.hpp	(original)
+++ branches/proto/v4/boost/thread/pthread/recursive_mutex.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -177,7 +177,7 @@
         {
             struct timespec const timeout=detail::get_timespec(abs_time);
             int const res=pthread_mutex_timedlock(&m,&timeout);
-            BOOST_ASSERT(!res || res==EBUSY);
+            BOOST_ASSERT(!res || res==ETIMEDOUT);
             return !res;
         }
 

Modified: branches/proto/v4/boost/thread/pthread/shared_mutex.hpp
==============================================================================
--- branches/proto/v4/boost/thread/pthread/shared_mutex.hpp	(original)
+++ branches/proto/v4/boost/thread/pthread/shared_mutex.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -57,18 +57,18 @@
         void lock_shared()
         {
             boost::this_thread::disable_interruption do_not_disturb;
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
                 
             while(state.exclusive || state.exclusive_waiting_blocked)
             {
-                shared_cond.wait(lock);
+                shared_cond.wait(lk);
             }
             ++state.shared_count;
         }
 
         bool try_lock_shared()
         {
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
                 
             if(state.exclusive || state.exclusive_waiting_blocked)
             {
@@ -84,11 +84,11 @@
         bool timed_lock_shared(system_time const& timeout)
         {
             boost::this_thread::disable_interruption do_not_disturb;
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
                 
             while(state.exclusive || state.exclusive_waiting_blocked)
             {
-                if(!shared_cond.timed_wait(lock,timeout))
+                if(!shared_cond.timed_wait(lk,timeout))
                 {
                     return false;
                 }
@@ -105,7 +105,7 @@
 
         void unlock_shared()
         {
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
             bool const last_reader=!--state.shared_count;
                 
             if(last_reader)
@@ -127,12 +127,12 @@
         void lock()
         {
             boost::this_thread::disable_interruption do_not_disturb;
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
                 
             while(state.shared_count || state.exclusive)
             {
                 state.exclusive_waiting_blocked=true;
-                exclusive_cond.wait(lock);
+                exclusive_cond.wait(lk);
             }
             state.exclusive=true;
         }
@@ -140,12 +140,12 @@
         bool timed_lock(system_time const& timeout)
         {
             boost::this_thread::disable_interruption do_not_disturb;
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
 
             while(state.shared_count || state.exclusive)
             {
                 state.exclusive_waiting_blocked=true;
-                if(!exclusive_cond.timed_wait(lock,timeout))
+                if(!exclusive_cond.timed_wait(lk,timeout))
                 {
                     if(state.shared_count || state.exclusive)
                     {
@@ -168,7 +168,7 @@
 
         bool try_lock()
         {
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
                 
             if(state.shared_count || state.exclusive)
             {
@@ -184,7 +184,7 @@
 
         void unlock()
         {
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
             state.exclusive=false;
             state.exclusive_waiting_blocked=false;
             release_waiters();
@@ -193,10 +193,10 @@
         void lock_upgrade()
         {
             boost::this_thread::disable_interruption do_not_disturb;
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
             while(state.exclusive || state.exclusive_waiting_blocked || state.upgrade)
             {
-                shared_cond.wait(lock);
+                shared_cond.wait(lk);
             }
             ++state.shared_count;
             state.upgrade=true;
@@ -205,10 +205,10 @@
         bool timed_lock_upgrade(system_time const& timeout)
         {
             boost::this_thread::disable_interruption do_not_disturb;
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
             while(state.exclusive || state.exclusive_waiting_blocked || state.upgrade)
             {
-                if(!shared_cond.timed_wait(lock,timeout))
+                if(!shared_cond.timed_wait(lk,timeout))
                 {
                     if(state.exclusive || state.exclusive_waiting_blocked || state.upgrade)
                     {
@@ -230,7 +230,7 @@
 
         bool try_lock_upgrade()
         {
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
             if(state.exclusive || state.exclusive_waiting_blocked || state.upgrade)
             {
                 return false;
@@ -245,7 +245,7 @@
 
         void unlock_upgrade()
         {
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
             state.upgrade=false;
             bool const last_reader=!--state.shared_count;
                 
@@ -259,11 +259,11 @@
         void unlock_upgrade_and_lock()
         {
             boost::this_thread::disable_interruption do_not_disturb;
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
             --state.shared_count;
             while(state.shared_count)
             {
-                upgrade_cond.wait(lock);
+                upgrade_cond.wait(lk);
             }
             state.upgrade=false;
             state.exclusive=true;
@@ -271,7 +271,7 @@
 
         void unlock_and_lock_upgrade()
         {
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
             state.exclusive=false;
             state.upgrade=true;
             ++state.shared_count;
@@ -281,7 +281,7 @@
         
         void unlock_and_lock_shared()
         {
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
             state.exclusive=false;
             ++state.shared_count;
             state.exclusive_waiting_blocked=false;
@@ -290,7 +290,7 @@
         
         void unlock_upgrade_and_lock_shared()
         {
-            boost::mutex::scoped_lock lock(state_change);
+            boost::mutex::scoped_lock lk(state_change);
             state.upgrade=false;
             state.exclusive_waiting_blocked=false;
             release_waiters();

Modified: branches/proto/v4/boost/tr1/array.hpp
==============================================================================
--- branches/proto/v4/boost/tr1/array.hpp	(original)
+++ branches/proto/v4/boost/tr1/array.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -9,7 +9,12 @@
 
 #ifdef BOOST_HAS_TR1_ARRAY
 
-#  include BOOST_TR1_HEADER(array)
+#  ifdef BOOST_HAS_INCLUDE_NEXT
+#     include_next BOOST_TR1_HEADER(array)
+#  else
+#     include <boost/tr1/detail/config_all.hpp>
+#     include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(array))
+#  endif
 
 #else
 

Modified: branches/proto/v4/boost/tr1/random.hpp
==============================================================================
--- branches/proto/v4/boost/tr1/random.hpp	(original)
+++ branches/proto/v4/boost/tr1/random.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -9,7 +9,12 @@
 #  include <boost/tr1/detail/config.hpp>
 
 #ifdef BOOST_HAS_TR1_RANDOM
-#  include BOOST_TR1_HEADER(random)
+#  ifdef BOOST_HAS_INCLUDE_NEXT
+#     include_next BOOST_TR1_HEADER(random)
+#  else
+#     include <boost/tr1/detail/config_all.hpp>
+#     include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(random))
+#  endif
 #else
 // Boost.Random:
 #include <boost/random.hpp>

Modified: branches/proto/v4/boost/tr1/regex.hpp
==============================================================================
--- branches/proto/v4/boost/tr1/regex.hpp	(original)
+++ branches/proto/v4/boost/tr1/regex.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -9,7 +9,12 @@
 
 #ifdef BOOST_HAS_TR1_REGEX
 
-#  include BOOST_TR1_HEADER(regex)
+#  ifdef BOOST_HAS_INCLUDE_NEXT
+#     include_next BOOST_TR1_HEADER(regex)
+#  else
+#     include <boost/tr1/detail/config_all.hpp>
+#     include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(regex))
+#  endif
 
 #else
 

Modified: branches/proto/v4/boost/tr1/tuple.hpp
==============================================================================
--- branches/proto/v4/boost/tr1/tuple.hpp	(original)
+++ branches/proto/v4/boost/tr1/tuple.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -9,7 +9,12 @@
 
 #ifdef BOOST_HAS_TR1_TUPLE
 
-#  include BOOST_TR1_HEADER(tuple)
+#  ifdef BOOST_HAS_INCLUDE_NEXT
+#     include_next BOOST_TR1_HEADER(tuple)
+#  else
+#     include <boost/tr1/detail/config_all.hpp>
+#     include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(tuple))
+#  endif
 
 #else
 

Modified: branches/proto/v4/boost/tr1/type_traits.hpp
==============================================================================
--- branches/proto/v4/boost/tr1/type_traits.hpp	(original)
+++ branches/proto/v4/boost/tr1/type_traits.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -8,7 +8,14 @@
 #  include <boost/tr1/detail/config.hpp>
 
 #ifdef BOOST_HAS_TR1_TYPE_TRAITS
-#  include BOOST_TR1_HEADER(type_traits)
+
+#  ifdef BOOST_HAS_INCLUDE_NEXT
+#     include_next BOOST_TR1_HEADER(type_traits)
+#  else
+#     include <boost/tr1/detail/config_all.hpp>
+#     include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(type_traits))
+#  endif
+
 #else
 // Boost Type Traits:
 #include <boost/type_traits.hpp>

Modified: branches/proto/v4/boost/tr1/unordered_map.hpp
==============================================================================
--- branches/proto/v4/boost/tr1/unordered_map.hpp	(original)
+++ branches/proto/v4/boost/tr1/unordered_map.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -9,7 +9,12 @@
 
 #ifdef BOOST_HAS_TR1_UNORDERED_MAP
 
-#  include BOOST_TR1_HEADER(unordered_map)
+#  ifdef BOOST_HAS_INCLUDE_NEXT
+#     include_next BOOST_TR1_HEADER(unordered_map)
+#  else
+#     include <boost/tr1/detail/config_all.hpp>
+#     include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(unordered_map))
+#  endif
 
 #else
 

Modified: branches/proto/v4/boost/tr1/unordered_set.hpp
==============================================================================
--- branches/proto/v4/boost/tr1/unordered_set.hpp	(original)
+++ branches/proto/v4/boost/tr1/unordered_set.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -9,7 +9,12 @@
 
 #ifdef BOOST_HAS_TR1_UNORDERED_SET
 
-#  include BOOST_TR1_HEADER(unordered_set)
+#  ifdef BOOST_HAS_INCLUDE_NEXT
+#     include_next BOOST_TR1_HEADER(unordered_set)
+#  else
+#     include <boost/tr1/detail/config_all.hpp>
+#     include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(unordered_set))
+#  endif
 
 #else
 

Modified: branches/proto/v4/boost/xpressive/proto/expr.hpp
==============================================================================
--- branches/proto/v4/boost/xpressive/proto/expr.hpp	(original)
+++ branches/proto/v4/boost/xpressive/proto/expr.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -134,7 +134,10 @@
 
     #endif // BOOST_PROTO_EXPR_HPP_EAN_04_01_2005
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
     #define ARG_COUNT BOOST_PP_MAX(1, BOOST_PP_ITERATION())
     #define IS_TERMINAL 0 == BOOST_PP_ITERATION()
@@ -404,4 +407,5 @@
 
     #undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif

Modified: branches/proto/v4/boost/xpressive/regex_primitives.hpp
==============================================================================
--- branches/proto/v4/boost/xpressive/regex_primitives.hpp	(original)
+++ branches/proto/v4/boost/xpressive/regex_primitives.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -12,6 +12,7 @@
 #include <vector>
 #include <climits>
 #include <boost/config.hpp>
+#include <boost/assert.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/assert.hpp>
@@ -43,6 +44,8 @@
     {
         mark_tag(int mark_nbr)
         {
+            // Marks numbers must be integers greater than 0.
+            BOOST_ASSERT(mark_nbr > 0);
             mark_placeholder mark = {mark_nbr};
             proto::value(*this) = mark;
         }

Modified: branches/proto/v4/doc/Jamfile.v2
==============================================================================
--- branches/proto/v4/doc/Jamfile.v2	(original)
+++ branches/proto/v4/doc/Jamfile.v2	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -71,11 +71,14 @@
 
     <dependency>css
     <dependency>images
+    <dependency>callouts
     ;
 
 install css : [ glob src/*.css ] : <location>html ;
 explicit css ;
 install images : [ glob src/images/*.png ] : <location>html/images ;
 explicit images ;
+install callouts : [ glob src/images/callouts/*.png ] : <location>html/images/callouts ;
+explicit callouts ;
 
 

Modified: branches/proto/v4/libs/conversion/lexical_cast.htm
==============================================================================
--- branches/proto/v4/libs/conversion/lexical_cast.htm	(original)
+++ branches/proto/v4/libs/conversion/lexical_cast.htm	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -81,7 +81,7 @@
                         conversions, such as where precision or formatting need tighter control than is 
                         offered by the default behavior of <code>lexical_cast</code>, the conventional <code>
                                 stringstream</code> approach is recommended. Where the conversions are 
-			numeric to numeric, <code>numeric_cast</code>
+			numeric to numeric, <code>numeric_cast</code>
                         may offer more reasonable behavior than <code>lexical_cast</code>.
                 <p>
                         For a good discussion of the options and issues involved in string-based 
@@ -213,9 +213,9 @@
     Lexical conversion to these types is simply reading a byte from source but since the source has
     more than one byte, the exception is thrown.
     <p>Please use other integer types such as <code>int</code> or <code>short int</code>. If bounds checking
-    is important, you can also call numeric_cast:
+    is important, you can also call numeric_cast:
 
-<pre>numeric_cast&lt;int8_t&gt;(lexical_cast&lt;int&gt;("127"));</pre>
+<pre>numeric_cast&lt;int8_t&gt;(lexical_cast&lt;int&gt;("127"));</pre>
 
     <p> Q: What does <code>lexical_cast&lt;std::string&gt;</code> of an <code>int8_t</code> or <code>uint8_t</code> not do what I expect?
     <br> A: As above, note that <code>int8_t</code> and <code>uint8_t</code> are actually chars and are formatted as such.  To avoid this, cast to an integer type first:

Modified: branches/proto/v4/libs/exception/doc/source/boost-exception.reno
==============================================================================
--- branches/proto/v4/libs/exception/doc/source/boost-exception.reno	(original)
+++ branches/proto/v4/libs/exception/doc/source/boost-exception.reno	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -53,33 +53,29 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>3</size>
-																			<strong>612485E090D76B2CC43C1A296F813075BA165C2496082E78E939F10B3DA8E09A</strong>
-																			<weak>1770110914</weak>
-																			<size>587</size>
-																			<position>1482</position>
-																			<strong>60F3F48B87487FA6E0D2CCC0750AF435CC92CEC80BBBF609AC71295031AADD0D</strong>
-																			<weak>3929437933</weak>
-																			<size>361</size>
-																			<position>213</position>
-																			<strong>CD1241D84950468704F3C3F04116B8DA5162A8BEA4364F10951232F49113C5DE</strong>
-																			<weak>1658463867</weak>
-																			<size>121</size>
-																			<position>238</position>
+																			<size>2</size>
+																			<strong>8C77439A1F52A50CF8C4131A44CC7FA9CF5E02508CB32C4FF40B565613A396F4</strong>
+																			<weak>476106477</weak>
+																			<size>3812</size>
+																			<position>518</position>
+																			<strong>D31BCE814DF5B8B718E7EB67A194AD08EF716A26D422E436596ABA1F145007D8</strong>
+																			<weak>4055211476</weak>
+																			<size>525</size>
+																			<position>3281</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/throw_exception.hpp</string>
+																		<string>../../../../boost/exception/info.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>configuration macros</string>
+																<string>exception/operator&lt;&lt;</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
                                                                                                                                 <string></string>
@@ -106,32 +102,36 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>2</size>
-																			<strong>F7633FDCF6615C0199645701EE6E7ACE5CBCD7A7CF6838573791E91ABB3C09F2</strong>
-																			<weak>1668435395</weak>
-																			<size>1332</size>
-																			<position>396</position>
-																			<strong>A1F443AF571973A12005D2F7D4AE09A32AAF686FEEAE272EC21512A65EB943E8</strong>
-																			<weak>3879093659</weak>
-																			<size>1300</size>
-																			<position>26</position>
+																			<size>3</size>
+																			<strong>55F1164770FD778354E151EF65A3E830DA20F325F7ED20A95130A4B83FC801BF</strong>
+																			<weak>1282550303</weak>
+																			<size>9192</size>
+																			<position>323</position>
+																			<strong>65D35B8A2063883A53E9D0DCC3FF8E5CA3573A58451A653CDE3003FFBEC576D3</strong>
+																			<weak>1693870740</weak>
+																			<size>2195</size>
+																			<position>3720</position>
+																			<strong>DA154372D8C23BD9EDC30005CA7959CE686D198891097A837D006B5222F04DE9</strong>
+																			<weak>2768248809</weak>
+																			<size>143</size>
+																			<position>60</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception/info_tuple.hpp</string>
+																		<string>../../../../boost/exception/exception.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>tuple/operator&lt;&lt;</string>
+																<string>exception::exception</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string></string>
+																<string>exception_constructors</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -156,14 +156,14 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>86E1196533E771AEFD141DA43FCD980AE3D7689A45EDD54A2DF28B1943E0E7DB</strong>
-																			<weak>941210061</weak>
-																			<size>8706</size>
+																			<strong>808CABE6CCA47C52CC9DD21911BF0B42284A5DD55AC3E665B29ED2B5F16AF7DA</strong>
+																			<weak>3660693492</weak>
+																			<size>8718</size>
                                                                                                                                                         <position>487</position>
-																			<strong>448B6444D4B3E46F822F56C14FDA3F6F96B869543EBA1E291C5E3D36F73AF24B</strong>
-																			<weak>2443226110</weak>
-																			<size>700</size>
-																			<position>1496</position>
+																			<strong>E23085202D084CBB50F289988A6A592F06D923B77D0AB25D7A98A7188DF5BE3B</strong>
+																			<weak>1414247481</weak>
+																			<size>766</size>
+																			<position>7382</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
@@ -177,7 +177,7 @@
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>unknown_exception</string>
+																<string>current_exception</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
                                                                                                                                 <string></string>
@@ -204,28 +204,36 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>1</size>
-																			<strong>A7B38E57D7A0B8823D9FE49F434B6B61D2C300ED96FA97BBAE9CED40660241DF</strong>
-																			<weak>882254800</weak>
-																			<size>9168</size>
-																			<position>323</position>
+																			<size>3</size>
+																			<strong>612485E090D76B2CC43C1A296F813075BA165C2496082E78E939F10B3DA8E09A</strong>
+																			<weak>1770110914</weak>
+																			<size>587</size>
+																			<position>1497</position>
+																			<strong>60F3F48B87487FA6E0D2CCC0750AF435CC92CEC80BBBF609AC71295031AADD0D</strong>
+																			<weak>3929437933</weak>
+																			<size>361</size>
+																			<position>213</position>
+																			<strong>CD1241D84950468704F3C3F04116B8DA5162A8BEA4364F10951232F49113C5DE</strong>
+																			<weak>1658463867</weak>
+																			<size>121</size>
+																			<position>238</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception/exception.hpp</string>
+																		<string>../../../../boost/throw_exception.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>boost/exception/exception.hpp</string>
+																<string>configuration macros</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>exception_exception_hpp</string>
+																<string></string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -249,28 +257,32 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>1</size>
-																			<strong>25DF01CCA9425952104C6606C336BB091879E4A22680790BBB352670DFB0E0CD</strong>
-																			<weak>4271502180</weak>
-																			<size>8870</size>
-																			<position>323</position>
+																			<size>2</size>
+																			<strong>126BB1D8971585CBE7D78EF3C12259D72FD5E973A84626AA9FC3234220A11CAB</strong>
+																			<weak>3471702891</weak>
+																			<size>969</size>
+																			<position>344</position>
+																			<strong>A7FD310E1340E103081DA2A7899DA0E213C696C84D52C17ADA09F6942EE97D47</strong>
+																			<weak>2978648279</weak>
+																			<size>530</size>
+																			<position>433</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception_ptr.hpp</string>
+																		<string>../../../../boost/exception/detail/error_info_impl.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>boost/exception_ptr.hpp</string>
+																<string>error_info</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>exception_cloning_hpp</string>
+																<string></string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -295,27 +307,27 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>1</size>
-																			<strong>CAD6C404CB725D336A44920D2341ECA131149AB02C368B59028F8147F16737BF</strong>
-																			<weak>2258638601</weak>
-																			<size>94</size>
-																			<position>227</position>
+																			<strong>8DC5E3F51F580F74905ADF7542CBFBE23989808ACFF69E8C2B98B5092C633B42</strong>
+																			<weak>378737885</weak>
+																			<size>4007</size>
+																			<position>323</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception/info_tuple.hpp</string>
+																		<string>../../../../boost/exception/info.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>boost/exception/info_tuple.hpp</string>
+																<string>boost/exception/info.hpp</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>exception_error_info_group_hpp</string>
+																<string>exception_error_info_hpp</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -323,7 +335,7 @@
                                                                                                 <container>
                                                                                                         <size>1</size>
                                                                                                         <variant>2</variant>
-													<string>(:include include:)&#10;(:auto also:)&#10;</string>
+													<string>(:include include:)&#10;&#10;(:auto also:)&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -339,28 +351,32 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>1</size>
-																			<strong>772781E5C169713B0AAF4BF73D567AB51C65D3D2DE185E43BDD75B8C3E0090AE</strong>
-																			<weak>2533913088</weak>
-																			<size>1998</size>
-																			<position>91</position>
+																			<size>2</size>
+																			<strong>808CABE6CCA47C52CC9DD21911BF0B42284A5DD55AC3E665B29ED2B5F16AF7DA</strong>
+																			<weak>3660693492</weak>
+																			<size>8718</size>
+																			<position>487</position>
+																			<strong>DA033132CFA8F85C147C01F51FF7CF7399CF7D32D412F730EA3219CDAC608C72</strong>
+																			<weak>3830952485</weak>
+																			<size>712</size>
+																			<position>1496</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/throw_exception.hpp</string>
+																		<string>../../../../boost/exception_ptr.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>boost/throw_exception.hpp</string>
+																<string>unknown_exception</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>throw_exception_hpp</string>
+																<string></string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -385,31 +401,31 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>9A4ECF9A49A73AED83C1565CB8C67AE1519E8AFE6818F968B4C4733CB9E86CEF</strong>
-																			<weak>1615599655</weak>
-																			<size>68</size>
-																			<position>227</position>
-																			<strong>34F0583BC8DE767CE2D79721E1F956895E43E5397473B1050F59BE7E26C773DB</strong>
-																			<weak>805836816</weak>
-																			<size>66</size>
-																			<position>1</position>
+																			<strong>55F1164770FD778354E151EF65A3E830DA20F325F7ED20A95130A4B83FC801BF</strong>
+																			<weak>1282550303</weak>
+																			<size>9192</size>
+																			<position>323</position>
+																			<strong>17E691632123EB67BA67D590B49EB8094F462F5A10A66A1C5438E1867EF1478E</strong>
+																			<weak>765399792</weak>
+																			<size>77</size>
+																			<position>5917</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception/error_info.hpp</string>
+																		<string>../../../../boost/exception/exception.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>boost/exception/error_info.hpp</string>
+																<string>exception::~exception</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>exception_error_info_value_hpp</string>
+																<string>exception_destructor</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -433,32 +449,21 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>2</size>
-																			<strong>A7B38E57D7A0B8823D9FE49F434B6B61D2C300ED96FA97BBAE9CED40660241DF</strong>
-																			<weak>882254800</weak>
-																			<size>9168</size>
-																			<position>323</position>
-																			<strong>DF9EA87B0140AACF4422F1B76F6A6A409C15F32858BBBA85A35981A824C56BA9</strong>
-																			<weak>1137981799</weak>
-																			<size>192</size>
-																			<position>8970</position>
+																			<size>0</size>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
-																		<empty>0</empty>
-																		<string>../../../../boost/exception/exception.hpp</string>
-																		<type>0</type>
-																		<base>0</base>
+																		<empty>1</empty>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>enable_current_exception</string>
+																<string>transporting of exceptions between threads</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string></string>
+																<string>tutorial_exception_ptr</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -482,29 +487,25 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>2</size>
-																			<strong>86E1196533E771AEFD141DA43FCD980AE3D7689A45EDD54A2DF28B1943E0E7DB</strong>
-																			<weak>941210061</weak>
-																			<size>8706</size>
-																			<position>487</position>
-																			<strong>0066D4E6E6B189906E6DE04F08509F3737511701A1B1355B37511EC18E8371F4</strong>
-																			<weak>2078296250</weak>
-																			<size>305</size>
-																			<position>8138</position>
+																			<size>1</size>
+																			<strong>17FF6C63843EE64ED66CB038DD95B4C4D6BA1B0FD36B27BEFD84A909161D2853</strong>
+																			<weak>1237535165</weak>
+																			<size>231</size>
+																			<position>1186</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception_ptr.hpp</string>
+																		<string>../../../../boost/throw_exception.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>copy_exception</string>
+																<string>BOOST_THROW_EXCEPTION</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
                                                                                                                                 <string></string>
@@ -515,7 +516,7 @@
                                                                                                 <container>
                                                                                                         <size>1</size>
                                                                                                         <variant>2</variant>
-													<string>(:include include:)&#10;(:auto also:)&#10;</string>
+													<string>(:include include:)&#10;(:pagelist link=&quot;backlink&quot;:)&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -532,28 +533,28 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>86E1196533E771AEFD141DA43FCD980AE3D7689A45EDD54A2DF28B1943E0E7DB</strong>
-																			<weak>941210061</weak>
-																			<size>8706</size>
-																			<position>487</position>
-																			<strong>0E9DF8366080712A816BE91ABCEF1E2044145B63D75B0B995B537900F378189E</strong>
-																			<weak>1069696031</weak>
-																			<size>255</size>
-																			<position>8445</position>
+																			<strong>439278045C9E304238B86C5BD4DA9CA64630D4CC73D442089068A186A28CA55A</strong>
+																			<weak>3686240039</weak>
+																			<size>1522</size>
+																			<position>433</position>
+																			<strong>6FE1F0AF570A010E8FDA1647DE61E0CC3AA979C8A8638722DAACDF8FBC4790D2</strong>
+																			<weak>1246830037</weak>
+																			<size>1023</size>
+																			<position>493</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception_ptr.hpp</string>
+																		<string>../../../../boost/exception/diagnostic_information.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>rethrow_exception</string>
+																<string>diagnostic_information</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
                                                                                                                                 <string></string>
@@ -581,35 +582,33 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>1</size>
-																			<strong>F6A7A960DE8CB8740E206D2585D4C83854DE073ABDAFFB8BD1C9A6B73428197D</strong>
-																			<weak>129904804</weak>
-																			<size>4115</size>
-																			<position>323</position>
+																			<strong>FC684D0DD5A9732B4130F2AB3DB6E0491D0F523E14B7FB738B2019EA2C7F8717</strong>
+																			<weak>2229778754</weak>
+																			<size>631</size>
+																			<position>319</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception/get_error_info.hpp</string>
+																		<string>../../example/cloning_2.cpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>boost/exception/get_error_info.hpp</string>
+																<string>cloning and re-throwing an exception</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>exception_get_error_info_hpp</string>
+																<string>cloning_and_rethrowing</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;(:auto also:)&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -669,31 +668,31 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>A7B38E57D7A0B8823D9FE49F434B6B61D2C300ED96FA97BBAE9CED40660241DF</strong>
-																			<weak>882254800</weak>
-																			<size>9168</size>
-																			<position>323</position>
-																			<strong>17E691632123EB67BA67D590B49EB8094F462F5A10A66A1C5438E1867EF1478E</strong>
-																			<weak>765399792</weak>
-																			<size>77</size>
-																			<position>5917</position>
+																			<strong>F7633FDCF6615C0199645701EE6E7ACE5CBCD7A7CF6838573791E91ABB3C09F2</strong>
+																			<weak>1668435395</weak>
+																			<size>1332</size>
+																			<position>396</position>
+																			<strong>A1F443AF571973A12005D2F7D4AE09A32AAF686FEEAE272EC21512A65EB943E8</strong>
+																			<weak>3879093659</weak>
+																			<size>1300</size>
+																			<position>26</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception/exception.hpp</string>
+																		<string>../../../../boost/exception/info_tuple.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>exception::~exception</string>
+																<string>tuple/operator&lt;&lt;</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>exception_destructor</string>
+																<string></string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -718,27 +717,27 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>1</size>
-																			<strong>8DC5E3F51F580F74905ADF7542CBFBE23989808ACFF69E8C2B98B5092C633B42</strong>
-																			<weak>378737885</weak>
-																			<size>4007</size>
-																			<position>323</position>
+																			<strong>CAD6C404CB725D336A44920D2341ECA131149AB02C368B59028F8147F16737BF</strong>
+																			<weak>2258638601</weak>
+																			<size>94</size>
+																			<position>227</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception/info.hpp</string>
+																		<string>../../../../boost/exception/info_tuple.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>boost/exception/info.hpp</string>
+																<string>boost/exception/info_tuple.hpp</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>exception_error_info_hpp</string>
+																<string>exception_error_info_group_hpp</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -746,7 +745,7 @@
                                                                                                 <container>
                                                                                                         <size>1</size>
                                                                                                         <variant>2</variant>
-													<string>(:include include:)&#10;&#10;(:auto also:)&#10;</string>
+													<string>(:include include:)&#10;(:auto also:)&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -762,21 +761,28 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>0</size>
+																			<size>1</size>
+																			<strong>FBC69CDA5E19FA40270F3855A8B99B2F77572439353F9DC5D15386F3520BC616</strong>
+																			<weak>1405483403</weak>
+																			<size>8882</size>
+																			<position>323</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
-																		<empty>1</empty>
+																		<empty>0</empty>
+																		<string>../../../../boost/exception_ptr.hpp</string>
+																		<type>0</type>
+																		<base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>boost/exception/enable_current_exception.hpp</string>
+																<string>boost/exception_ptr.hpp</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>exception_enable_current_exception_hpp</string>
+																<string>exception_cloning_hpp</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -800,21 +806,32 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>0</size>
+																			<size>2</size>
+																			<strong>9A4ECF9A49A73AED83C1565CB8C67AE1519E8AFE6818F968B4C4733CB9E86CEF</strong>
+																			<weak>1615599655</weak>
+																			<size>68</size>
+																			<position>227</position>
+																			<strong>34F0583BC8DE767CE2D79721E1F956895E43E5397473B1050F59BE7E26C773DB</strong>
+																			<weak>805836816</weak>
+																			<size>66</size>
+																			<position>1</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
-																		<empty>1</empty>
+																		<empty>0</empty>
+																		<string>../../../../boost/exception/error_info.hpp</string>
+																		<type>0</type>
+																		<base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>boost/exception/enable_error_info.hpp</string>
+																<string>boost/exception/error_info.hpp</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>exception_enable_error_info_hpp</string>
+																<string>exception_error_info_value_hpp</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -839,15 +856,15 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>86E1196533E771AEFD141DA43FCD980AE3D7689A45EDD54A2DF28B1943E0E7DB</strong>
-																			<weak>941210061</weak>
-																			<size>8706</size>
+																			<strong>808CABE6CCA47C52CC9DD21911BF0B42284A5DD55AC3E665B29ED2B5F16AF7DA</strong>
+																			<weak>3660693492</weak>
+																			<size>8718</size>
                                                                                                                                                         <position>487</position>
-																			<strong>E23085202D084CBB50F289988A6A592F06D923B77D0AB25D7A98A7188DF5BE3B</strong>
-																			<weak>1414247481</weak>
-																			<size>766</size>
-																			<position>7370</position>
-																		</container>
+																			<strong>F86EB07D04CD0D0645080D1121DA899746D0C45137E17E1D9BE605E75396F047</strong>
+																			<weak>1983537541</weak>
+																			<size>1346</size>
+																			<position>148</position>
+																		</container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
@@ -860,7 +877,7 @@
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>current_exception</string>
+																<string>exception_ptr</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
                                                                                                                                 <string></string>
@@ -888,10 +905,10 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>1</size>
-																			<strong>17FF6C63843EE64ED66CB038DD95B4C4D6BA1B0FD36B27BEFD84A909161D2853</strong>
-																			<weak>1237535165</weak>
-																			<size>231</size>
-																			<position>1171</position>
+																			<strong>373FAB70D1DAE4F1111AACCCCD3F6B55EAF8D1222E03A26A5A2F860B70D2D0C4</strong>
+																			<weak>3697768091</weak>
+																			<size>2013</size>
+																			<position>91</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
@@ -905,10 +922,10 @@
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>BOOST_THROW_EXCEPTION</string>
+																<string>boost/throw_exception.hpp</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string></string>
+																<string>throw_exception_hpp</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -916,7 +933,7 @@
                                                                                                 <container>
                                                                                                         <size>1</size>
                                                                                                         <variant>2</variant>
-													<string>(:include include:)&#10;(:pagelist link=&quot;backlink&quot;:)&#10;</string>
+													<string>(:include include:)&#10;(:auto also:)&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -933,9 +950,9 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>1</size>
-																			<strong>265AFB67CCEF87EC9B58DB910ED23C0B1A5546C44767E2FFD6829ABADAF4828B</strong>
-																			<weak>1235989793</weak>
-																			<size>1632</size>
+																			<strong>55F1164770FD778354E151EF65A3E830DA20F325F7ED20A95130A4B83FC801BF</strong>
+																			<weak>1282550303</weak>
+																			<size>9192</size>
                                                                                                                                                         <position>323</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
@@ -943,17 +960,17 @@
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception/diagnostic_information.hpp</string>
+																		<string>../../../../boost/exception/exception.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>boost/exception/diagnostic_information.hpp</string>
+																<string>boost/exception/exception.hpp</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>exception_diagnostic_information_hpp</string>
+																<string>exception_exception_hpp</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -977,40 +994,34 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>2</size>
-																			<strong>8C77439A1F52A50CF8C4131A44CC7FA9CF5E02508CB32C4FF40B565613A396F4</strong>
-																			<weak>476106477</weak>
-																			<size>3812</size>
-																			<position>518</position>
-																			<strong>D31BCE814DF5B8B718E7EB67A194AD08EF716A26D422E436596ABA1F145007D8</strong>
-																			<weak>4055211476</weak>
-																			<size>525</size>
-																			<position>3281</position>
+																			<size>1</size>
+																			<strong>187BFD2B78A0DD006717B5B06FFD465E2468F521C32A86FB793F7A68AB5417F3</strong>
+																			<weak>4276724153</weak>
+																			<size>574</size>
+																			<position>382</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception/info.hpp</string>
+																		<string>../../example/error_info_1.cpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>exception/operator&lt;&lt;</string>
+																<string>adding of arbitrary data at the point of the throw</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string></string>
+																<string>adding_data_at_throw</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;(:auto also:)&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -1026,32 +1037,28 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>2</size>
-																			<strong>A7B38E57D7A0B8823D9FE49F434B6B61D2C300ED96FA97BBAE9CED40660241DF</strong>
-																			<weak>882254800</weak>
-																			<size>9168</size>
-																			<position>323</position>
-																			<strong>B4D37C317A3B45825DDA1A8C8B1CE71CC2E530D15090D05995FCBEC4247F49C4</strong>
-																			<weak>2742768198</weak>
-																			<size>258</size>
-																			<position>7305</position>
+																			<size>1</size>
+																			<strong>D9B8E6AA12A4F33953B1A961FA590C5A3840234B6531CA8C04AC985AD5800835</strong>
+																			<weak>2432554768</weak>
+																			<size>702</size>
+																			<position>408</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception/exception.hpp</string>
+																		<string>../../example/enable_error_info.cpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>enable_error_info</string>
+																<string>integrating boost exception in existing exception class hierarchies</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string></string>
+																<string>tutorial_enable_error_info</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -1075,28 +1082,32 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>1</size>
-																			<strong>67D64FAD0AB7CA6B2173A14F363D19B27F59EEBDB5C1076F8BCCA1B54D4CCD7D</strong>
-																			<weak>2241687287</weak>
-																			<size>303</size>
-																			<position>323</position>
+																			<size>2</size>
+																			<strong>612485E090D76B2CC43C1A296F813075BA165C2496082E78E939F10B3DA8E09A</strong>
+																			<weak>1770110914</weak>
+																			<size>587</size>
+																			<position>1497</position>
+																			<strong>60F3F48B87487FA6E0D2CCC0750AF435CC92CEC80BBBF609AC71295031AADD0D</strong>
+																			<weak>3929437933</weak>
+																			<size>361</size>
+																			<position>213</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception.hpp</string>
+																		<string>../../../../boost/throw_exception.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>boost/exception.hpp</string>
+																<string>throw_exception</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>exception_hpp</string>
+																<string></string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -1120,34 +1131,29 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>1</size>
-																			<strong>FC684D0DD5A9732B4130F2AB3DB6E0491D0F523E14B7FB738B2019EA2C7F8717</strong>
-																			<weak>2229778754</weak>
-																			<size>631</size>
-																			<position>319</position>
+																			<size>0</size>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
-																		<empty>0</empty>
-																		<string>../../example/cloning_2.cpp</string>
-																		<type>0</type>
-																		<base>0</base>
+																		<empty>1</empty>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>cloning and re-throwing an exception</string>
+																<string>transporting of arbitrary data to the catch site</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>cloning_and_rethrowing</string>
+																<string>tutorial_transporting_data</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;(:auto also:)&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -1163,36 +1169,28 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>3</size>
-																			<strong>A7B38E57D7A0B8823D9FE49F434B6B61D2C300ED96FA97BBAE9CED40660241DF</strong>
-																			<weak>882254800</weak>
-																			<size>9168</size>
-																			<position>323</position>
-																			<strong>65D35B8A2063883A53E9D0DCC3FF8E5CA3573A58451A653CDE3003FFBEC576D3</strong>
-																			<weak>1693870740</weak>
-																			<size>2195</size>
-																			<position>3720</position>
-																			<strong>DA154372D8C23BD9EDC30005CA7959CE686D198891097A837D006B5222F04DE9</strong>
-																			<weak>2768248809</weak>
-																			<size>143</size>
-																			<position>60</position>
+																			<size>1</size>
+																			<strong>7116AEECEA666794E31DC99390ADEC1BA6AF74B2398067A0739767B4B76FA97A</strong>
+																			<weak>4128134227</weak>
+																			<size>307</size>
+																			<position>302</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception/exception.hpp</string>
+																		<string>../../example/logging.cpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>exception::exception</string>
+																<string>diagnostic information</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>exception_constructors</string>
+																<string>tutorial_diagnostic_information</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -1217,28 +1215,28 @@
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
                                                                                                                                                         <size>2</size>
-																			<strong>439278045C9E304238B86C5BD4DA9CA64630D4CC73D442089068A186A28CA55A</strong>
-																			<weak>3686240039</weak>
-																			<size>1522</size>
-																			<position>433</position>
-																			<strong>6FE1F0AF570A010E8FDA1647DE61E0CC3AA979C8A8638722DAACDF8FBC4790D2</strong>
-																			<weak>1246830037</weak>
-																			<size>1023</size>
-																			<position>493</position>
+																			<strong>55F1164770FD778354E151EF65A3E830DA20F325F7ED20A95130A4B83FC801BF</strong>
+																			<weak>1282550303</weak>
+																			<size>9192</size>
+																			<position>323</position>
+																			<strong>65D35B8A2063883A53E9D0DCC3FF8E5CA3573A58451A653CDE3003FFBEC576D3</strong>
+																			<weak>1693870740</weak>
+																			<size>2195</size>
+																			<position>3720</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception/diagnostic_information.hpp</string>
+																		<string>../../../../boost/exception/exception.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>diagnostic_information</string>
+																<string>exception</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
                                                                                                                                 <string></string>
@@ -1249,7 +1247,7 @@
                                                                                                 <container>
                                                                                                         <size>1</size>
                                                                                                         <variant>2</variant>
-													<string>(:include include:)&#10;(:auto also:)&#10;</string>
+													<string>(:include include:)&#10;----&#10;!!!See Also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;exception,member&quot; mod=&quot;w&quot;:)&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -1265,66 +1263,28 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>0</size>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>1</empty>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>transporting of exceptions between threads</string>
-															</title>
-															<file_name>
-																<string>tutorial_exception_ptr</string>
-															</file_name>
-														</object>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;(:auto also:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>32</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
                                                                                                                                                         <size>1</size>
-																			<strong>E444EE9697EEADFDE0767E1D0242FC0E70D98E61FB1F0FFA099648DE509B82F3</strong>
-																			<weak>94503238</weak>
-																			<size>773</size>
-																			<position>374</position>
+																			<strong>4ED9709788BBAB4DE7CF336561606B8C0B41F70877A3395F4EE026F4AEB66CC6</strong>
+																			<weak>743998427</weak>
+																			<size>409</size>
+																			<position>307</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../example/info_tuple.cpp</string>
+																		<string>../../example/cloning_1.cpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>adding grouped data to exceptions</string>
+																<string>using enable_current_exception at the time of the throw</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>grouping_data</string>
+																<string>using_enable_cloning</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -1337,7 +1297,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>33</id>
+														<id>32</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -1346,32 +1306,21 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>2</size>
-																			<strong>86E1196533E771AEFD141DA43FCD980AE3D7689A45EDD54A2DF28B1943E0E7DB</strong>
-																			<weak>941210061</weak>
-																			<size>8706</size>
-																			<position>487</position>
-																			<strong>F86EB07D04CD0D0645080D1121DA899746D0C45137E17E1D9BE605E75396F047</strong>
-																			<weak>1983537541</weak>
-																			<size>1346</size>
-																			<position>148</position>
+																			<size>0</size>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
-																		<empty>0</empty>
-																		<string>../../../../boost/exception_ptr.hpp</string>
-																		<type>0</type>
-																		<base>0</base>
+																		<empty>1</empty>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>exception_ptr</string>
+																<string>Index</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string></string>
+																<string>name_idx</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -1379,14 +1328,14 @@
                                                                                                 <container>
                                                                                                         <size>1</size>
                                                                                                         <variant>2</variant>
-													<string>(:include include:)&#10;(:auto also:)&#10;</string>
+													<string>(:auto !:)&#10;&#10;(:pagelist fmt=&quot;index&quot; except_tags=&quot;index,noindex&quot; mod=&quot;w&quot;:)&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>34</id>
+														<id>33</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -1395,32 +1344,21 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>2</size>
-																			<strong>8F178D422EC1891AEDF90A4DCA7BCEC96D29D1B0A70726C222513D699679F59D</strong>
-																			<weak>3253069900</weak>
-																			<size>3913</size>
-																			<position>525</position>
-																			<strong>BB8AF986C96801345719855FEA083AF5684FBC349F6520E150F19A6370019265</strong>
-																			<weak>3731478139</weak>
-																			<size>686</size>
-																			<position>3221</position>
+																			<size>0</size>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
-																		<empty>0</empty>
-																		<string>../../../../boost/exception/get_error_info.hpp</string>
-																		<type>0</type>
-																		<base>0</base>
+																		<empty>1</empty>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>get_error_info</string>
+																<string>boost/exception/enable_current_exception.hpp</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string></string>
+																<string>exception_enable_current_exception_hpp</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -1435,7 +1373,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>35</id>
+														<id>34</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -1444,32 +1382,28 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>2</size>
-																			<strong>126BB1D8971585CBE7D78EF3C12259D72FD5E973A84626AA9FC3234220A11CAB</strong>
-																			<weak>3471702891</weak>
-																			<size>969</size>
-																			<position>344</position>
-																			<strong>A7FD310E1340E103081DA2A7899DA0E213C696C84D52C17ADA09F6942EE97D47</strong>
-																			<weak>2978648279</weak>
-																			<size>530</size>
-																			<position>433</position>
+																			<size>1</size>
+																			<strong>7CAF5D62B1ED0802B65B428119DBDD84C352A24A98EB167E1B0681F3E8DD7628</strong>
+																			<weak>3711957388</weak>
+																			<size>3837</size>
+																			<position>323</position>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
                                                                                                                                                 <empty>0</empty>
-																		<string>../../../../boost/exception/detail/error_info_impl.hpp</string>
+																		<string>../../../../boost/exception/get_error_info.hpp</string>
                                                                                                                                                 <type>0</type>
                                                                                                                                                 <base>0</base>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>error_info</string>
+																<string>boost/exception/get_error_info.hpp</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string></string>
+																<string>exception_get_error_info_hpp</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -1484,7 +1418,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>36</id>
+														<id>35</id>
                                                                                                                 <type>
                                                                                                                         <string>reno_context</string>
                                                                                                                 </type>
@@ -1493,333 +1427,21 @@
                                                                                                                                 <hook>
                                                                                                                                         <stream_hook_path>
                                                                                                                                                 <container>
-																			<size>1</size>
-																			<strong>187BFD2B78A0DD006717B5B06FFD465E2468F521C32A86FB793F7A68AB5417F3</strong>
-																			<weak>4276724153</weak>
-																			<size>574</size>
-																			<position>382</position>
+																			<size>0</size>
                                                                                                                                                 </container>
                                                                                                                                         </stream_hook_path>
                                                                                                                                 </hook>
                                                                                                                                 <file>
                                                                                                                                         <path>
-																		<empty>0</empty>
-																		<string>../../example/error_info_1.cpp</string>
-																		<type>0</type>
-																		<base>0</base>
+																		<empty>1</empty>
                                                                                                                                         </path>
                                                                                                                                 </file>
                                                                                                                         </hook>
                                                                                                                         <title>
-																<string>adding of arbitrary data at the point of the throw</string>
+																<string>boost exception</string>
                                                                                                                         </title>
                                                                                                                         <file_name>
-																<string>adding_data_at_throw</string>
-															</file_name>
-														</object>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>37</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>1</size>
-																			<strong>D9B8E6AA12A4F33953B1A961FA590C5A3840234B6531CA8C04AC985AD5800835</strong>
-																			<weak>2432554768</weak>
-																			<size>702</size>
-																			<position>408</position>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>0</empty>
-																		<string>../../example/enable_error_info.cpp</string>
-																		<type>0</type>
-																		<base>0</base>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>integrating boost exception in existing exception class hierarchies</string>
-															</title>
-															<file_name>
-																<string>tutorial_enable_error_info</string>
-															</file_name>
-														</object>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;(:auto also:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>38</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>2</size>
-																			<strong>612485E090D76B2CC43C1A296F813075BA165C2496082E78E939F10B3DA8E09A</strong>
-																			<weak>1770110914</weak>
-																			<size>587</size>
-																			<position>1482</position>
-																			<strong>60F3F48B87487FA6E0D2CCC0750AF435CC92CEC80BBBF609AC71295031AADD0D</strong>
-																			<weak>3929437933</weak>
-																			<size>361</size>
-																			<position>213</position>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>0</empty>
-																		<string>../../../../boost/throw_exception.hpp</string>
-																		<type>0</type>
-																		<base>0</base>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>throw_exception</string>
-															</title>
-															<file_name>
-																<string></string>
-															</file_name>
-														</object>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;(:auto also:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>39</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>0</size>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>1</empty>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>transporting of arbitrary data to the catch site</string>
-															</title>
-															<file_name>
-																<string>tutorial_transporting_data</string>
-															</file_name>
-														</object>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;(:auto also:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>40</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>1</size>
-																			<strong>7116AEECEA666794E31DC99390ADEC1BA6AF74B2398067A0739767B4B76FA97A</strong>
-																			<weak>4128134227</weak>
-																			<size>307</size>
-																			<position>302</position>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>0</empty>
-																		<string>../../example/logging.cpp</string>
-																		<type>0</type>
-																		<base>0</base>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>diagnostic information</string>
-															</title>
-															<file_name>
-																<string>tutorial_diagnostic_information</string>
-															</file_name>
-														</object>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;(:auto also:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>41</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>2</size>
-																			<strong>A7B38E57D7A0B8823D9FE49F434B6B61D2C300ED96FA97BBAE9CED40660241DF</strong>
-																			<weak>882254800</weak>
-																			<size>9168</size>
-																			<position>323</position>
-																			<strong>65D35B8A2063883A53E9D0DCC3FF8E5CA3573A58451A653CDE3003FFBEC576D3</strong>
-																			<weak>1693870740</weak>
-																			<size>2195</size>
-																			<position>3720</position>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>0</empty>
-																		<string>../../../../boost/exception/exception.hpp</string>
-																		<type>0</type>
-																		<base>0</base>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>exception</string>
-															</title>
-															<file_name>
-																<string></string>
-															</file_name>
-														</object>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:include include:)&#10;----&#10;!!!See Also:&#10;&#10;(:pagelist link=&quot;backlink&quot; except_tags=&quot;exception,member&quot; mod=&quot;w&quot;:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>42</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>1</size>
-																			<strong>4ED9709788BBAB4DE7CF336561606B8C0B41F70877A3395F4EE026F4AEB66CC6</strong>
-																			<weak>743998427</weak>
-																			<size>409</size>
-																			<position>307</position>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>0</empty>
-																		<string>../../example/cloning_1.cpp</string>
-																		<type>0</type>
-																		<base>0</base>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>using enable_current_exception at the time of the throw</string>
-															</title>
-															<file_name>
-																<string>using_enable_cloning</string>
-															</file_name>
-														</object>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>43</id>
-														<type>
-															<string>reno_context</string>
-														</type>
-														<object>
-															<hook>
-																<hook>
-																	<stream_hook_path>
-																		<container>
-																			<size>0</size>
-																		</container>
-																	</stream_hook_path>
-																</hook>
-																<file>
-																	<path>
-																		<empty>1</empty>
-																	</path>
-																</file>
-															</hook>
-															<title>
-																<string>boost exception</string>
-															</title>
-															<file_name>
-																<string>boost-exception</string>
+																<string>boost-exception</string>
                                                                                                                         </file_name>
                                                                                                                 </object>
                                                                                                         </shared_ptr>
@@ -1832,7 +1454,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-31</id>
+															<id>-13</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1841,7 +1463,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-38</id>
+															<id>-27</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1850,7 +1472,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-39</id>
+															<id>-28</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1859,7 +1481,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-37</id>
+															<id>-26</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1868,7 +1490,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-31</id>
+															<id>-13</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1877,7 +1499,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-40</id>
+															<id>-29</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1886,7 +1508,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1895,7 +1517,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1904,7 +1526,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-25</id>
+															<id>-5</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1913,7 +1535,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-6</id>
+															<id>-18</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1922,7 +1544,43 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-34</id>
+															<id>36</id>
+															<type>
+																<string>reno_context</string>
+															</type>
+															<object>
+																<hook>
+																	<hook>
+																		<stream_hook_path>
+																			<container>
+																				<size>2</size>
+																				<strong>391956879B098B05CB774BAD3285881434482FD633818A579F7183052E6BAD09</strong>
+																				<weak>1787869209</weak>
+																				<size>3656</size>
+																				<position>504</position>
+																				<strong>BB8AF986C96801345719855FEA083AF5684FBC349F6520E150F19A6370019265</strong>
+																				<weak>3731478139</weak>
+																				<size>686</size>
+																				<position>2964</position>
+																			</container>
+																		</stream_hook_path>
+																	</hook>
+																	<file>
+																		<path>
+																			<empty>0</empty>
+																			<string>../../../../boost/exception/get_error_info.hpp</string>
+																			<type>0</type>
+																			<base>0</base>
+																		</path>
+																	</file>
+																</hook>
+																<title>
+																	<string>get_error_info</string>
+																</title>
+																<file_name>
+																	<string></string>
+																</file_name>
+															</object>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1931,7 +1589,43 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-26</id>
+															<id>37</id>
+															<type>
+																<string>reno_context</string>
+															</type>
+															<object>
+																<hook>
+																	<hook>
+																		<stream_hook_path>
+																			<container>
+																				<size>2</size>
+																				<strong>55F1164770FD778354E151EF65A3E830DA20F325F7ED20A95130A4B83FC801BF</strong>
+																				<weak>1282550303</weak>
+																				<size>9192</size>
+																				<position>323</position>
+																				<strong>F3FB15CD82336271C6E875BC620385322777D16F0B7C233300783CE35710CCBF</strong>
+																				<weak>3292878997</weak>
+																				<size>282</size>
+																				<position>7305</position>
+																			</container>
+																		</stream_hook_path>
+																	</hook>
+																	<file>
+																		<path>
+																			<empty>0</empty>
+																			<string>../../../../boost/exception/exception.hpp</string>
+																			<type>0</type>
+																			<base>0</base>
+																		</path>
+																	</file>
+																</hook>
+																<title>
+																	<string>enable_error_info</string>
+																</title>
+																<file_name>
+																	<string></string>
+																</file_name>
+															</object>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1940,7 +1634,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1949,7 +1643,43 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>38</id>
+															<type>
+																<string>reno_context</string>
+															</type>
+															<object>
+																<hook>
+																	<hook>
+																		<stream_hook_path>
+																			<container>
+																				<size>2</size>
+																				<strong>55F1164770FD778354E151EF65A3E830DA20F325F7ED20A95130A4B83FC801BF</strong>
+																				<weak>1282550303</weak>
+																				<size>9192</size>
+																				<position>323</position>
+																				<strong>DF9EA87B0140AACF4422F1B76F6A6A409C15F32858BBBA85A35981A824C56BA9</strong>
+																				<weak>1137981799</weak>
+																				<size>192</size>
+																				<position>8994</position>
+																			</container>
+																		</stream_hook_path>
+																	</hook>
+																	<file>
+																		<path>
+																			<empty>0</empty>
+																			<string>../../../../boost/exception/exception.hpp</string>
+																			<type>0</type>
+																			<base>0</base>
+																		</path>
+																	</file>
+																</hook>
+																<title>
+																	<string>enable_current_exception</string>
+																</title>
+																<file_name>
+																	<string></string>
+																</file_name>
+															</object>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1958,7 +1688,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-22</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1967,7 +1697,43 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-14</id>
+															<id>39</id>
+															<type>
+																<string>reno_context</string>
+															</type>
+															<object>
+																<hook>
+																	<hook>
+																		<stream_hook_path>
+																			<container>
+																				<size>2</size>
+																				<strong>808CABE6CCA47C52CC9DD21911BF0B42284A5DD55AC3E665B29ED2B5F16AF7DA</strong>
+																				<weak>3660693492</weak>
+																				<size>8718</size>
+																				<position>487</position>
+																				<strong>0066D4E6E6B189906E6DE04F08509F3737511701A1B1355B37511EC18E8371F4</strong>
+																				<weak>2078296250</weak>
+																				<size>305</size>
+																				<position>8150</position>
+																			</container>
+																		</stream_hook_path>
+																	</hook>
+																	<file>
+																		<path>
+																			<empty>0</empty>
+																			<string>../../../../boost/exception_ptr.hpp</string>
+																			<type>0</type>
+																			<base>0</base>
+																		</path>
+																	</file>
+																</hook>
+																<title>
+																	<string>copy_exception</string>
+																</title>
+																<file_name>
+																	<string></string>
+																</file_name>
+															</object>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1976,7 +1742,43 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-15</id>
+															<id>40</id>
+															<type>
+																<string>reno_context</string>
+															</type>
+															<object>
+																<hook>
+																	<hook>
+																		<stream_hook_path>
+																			<container>
+																				<size>2</size>
+																				<strong>808CABE6CCA47C52CC9DD21911BF0B42284A5DD55AC3E665B29ED2B5F16AF7DA</strong>
+																				<weak>3660693492</weak>
+																				<size>8718</size>
+																				<position>487</position>
+																				<strong>0E9DF8366080712A816BE91ABCEF1E2044145B63D75B0B995B537900F378189E</strong>
+																				<weak>1069696031</weak>
+																				<size>255</size>
+																				<position>8457</position>
+																			</container>
+																		</stream_hook_path>
+																	</hook>
+																	<file>
+																		<path>
+																			<empty>0</empty>
+																			<string>../../../../boost/exception_ptr.hpp</string>
+																			<type>0</type>
+																			<base>0</base>
+																		</path>
+																	</file>
+																</hook>
+																<title>
+																	<string>rethrow_exception</string>
+																</title>
+																<file_name>
+																	<string></string>
+																</file_name>
+															</object>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1985,7 +1787,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-7</id>
+															<id>-11</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -1994,7 +1796,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-30</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2003,7 +1805,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-38</id>
+															<id>-27</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2012,7 +1814,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-23</id>
+															<id>-14</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2021,7 +1823,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-5</id>
+															<id>-8</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2030,7 +1832,39 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-27</id>
+															<id>41</id>
+															<type>
+																<string>reno_context</string>
+															</type>
+															<object>
+																<hook>
+																	<hook>
+																		<stream_hook_path>
+																			<container>
+																				<size>1</size>
+																				<strong>67D64FAD0AB7CA6B2173A14F363D19B27F59EEBDB5C1076F8BCCA1B54D4CCD7D</strong>
+																				<weak>2241687287</weak>
+																				<size>303</size>
+																				<position>323</position>
+																			</container>
+																		</stream_hook_path>
+																	</hook>
+																	<file>
+																		<path>
+																			<empty>0</empty>
+																			<string>../../../../boost/exception.hpp</string>
+																			<type>0</type>
+																			<base>0</base>
+																		</path>
+																	</file>
+																</hook>
+																<title>
+																	<string>boost/exception.hpp</string>
+																</title>
+																<file_name>
+																	<string>exception_hpp</string>
+																</file_name>
+															</object>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2039,7 +1873,39 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-24</id>
+															<id>42</id>
+															<type>
+																<string>reno_context</string>
+															</type>
+															<object>
+																<hook>
+																	<hook>
+																		<stream_hook_path>
+																			<container>
+																				<size>1</size>
+																				<strong>265AFB67CCEF87EC9B58DB910ED23C0B1A5546C44767E2FFD6829ABADAF4828B</strong>
+																				<weak>1235989793</weak>
+																				<size>1632</size>
+																				<position>323</position>
+																			</container>
+																		</stream_hook_path>
+																	</hook>
+																	<file>
+																		<path>
+																			<empty>0</empty>
+																			<string>../../../../boost/exception/diagnostic_information.hpp</string>
+																			<type>0</type>
+																			<base>0</base>
+																		</path>
+																	</file>
+																</hook>
+																<title>
+																	<string>boost/exception/diagnostic_information.hpp</string>
+																</title>
+																<file_name>
+																	<string>exception_diagnostic_information_hpp</string>
+																</file_name>
+															</object>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2048,7 +1914,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-20</id>
+															<id>-33</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2057,7 +1923,32 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-21</id>
+															<id>43</id>
+															<type>
+																<string>reno_context</string>
+															</type>
+															<object>
+																<hook>
+																	<hook>
+																		<stream_hook_path>
+																			<container>
+																				<size>0</size>
+																			</container>
+																		</stream_hook_path>
+																	</hook>
+																	<file>
+																		<path>
+																			<empty>1</empty>
+																		</path>
+																	</file>
+																</hook>
+																<title>
+																	<string>boost/exception/enable_error_info.hpp</string>
+																</title>
+																<file_name>
+																	<string>exception_enable_error_info_hpp</string>
+																</file_name>
+															</object>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2066,7 +1957,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-12</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2075,7 +1966,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-24</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2084,7 +1975,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-16</id>
+															<id>-34</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2093,7 +1984,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2102,7 +1993,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-10</id>
+															<id>-19</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2111,7 +2002,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-20</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2120,7 +2011,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-11</id>
+															<id>-23</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2129,32 +2020,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>44</id>
-															<type>
-																<string>reno_context</string>
-															</type>
-															<object>
-																<hook>
-																	<hook>
-																		<stream_hook_path>
-																			<container>
-																				<size>0</size>
-																			</container>
-																		</stream_hook_path>
-																	</hook>
-																	<file>
-																		<path>
-																			<empty>1</empty>
-																		</path>
-																	</file>
-																</hook>
-																<title>
-																	<string>Index</string>
-																</title>
-																<file_name>
-																	<string>name_idx</string>
-																</file_name>
-															</object>
+															<id>-32</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2163,7 +2029,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-27</id>
+															<id>-41</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2172,7 +2038,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-24</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2181,7 +2047,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2190,7 +2056,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-10</id>
+															<id>-19</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2199,7 +2065,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-21</id>
+															<id>-43</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2208,7 +2074,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-24</id>
+															<id>-42</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2217,7 +2083,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-20</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2226,7 +2092,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-20</id>
+															<id>-33</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2235,7 +2101,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-11</id>
+															<id>-23</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2244,7 +2110,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-11</id>
+															<id>-23</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2253,7 +2119,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2262,7 +2128,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2271,7 +2137,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-25</id>
+															<id>-5</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2280,7 +2146,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-6</id>
+															<id>-18</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2289,7 +2155,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-34</id>
+															<id>-36</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2298,7 +2164,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-26</id>
+															<id>-37</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2307,7 +2173,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2316,7 +2182,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-38</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2325,7 +2191,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-22</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -2334,60 +2200,194 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-14</id>
+															<id>-39</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&#10;&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-40</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&#10;&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-11</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&#10;&#10;&#10;!!Printing Diagnostic Information&#10;&#10;&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&#10;&#10;&#10;!!Throwing Exceptions&#10;&#10;&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-27</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-15</id>
-														</shared_ptr>
-													</weak_ptr>
+													<string>:)&#10;&#10;&#10;!!Acknowledgements&#10;&#10;Peter Dimov has been continuously influencing the design and evolution of Boost Exception. Also thanks to Tobias Schwinger, Tom Brinkman, Pavel Vozenilek and everyone who participated in the review process.&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-39</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;(:auto also:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-40</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;(:auto also:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-38</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:include include:)&#10;(:auto also:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-41</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
                                                                                                         <variant>2</variant>
-													<string>:)&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-7</id>
-														</shared_ptr>
-													</weak_ptr>
+													<string>(:include include:)&#10;(:auto also:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-43</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
                                                                                                         <variant>2</variant>
-													<string>:)&#10;&#10;&#10;!!Printing Diagnostic Information&#10;&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-30</id>
-														</shared_ptr>
-													</weak_ptr>
+													<string>(:include include:)&#10;(:auto also:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-37</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
                                                                                                         <variant>2</variant>
-													<string>:)&#10;&#10;&#10;!!Throwing Exceptions&#10;&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-38</id>
-														</shared_ptr>
-													</weak_ptr>
+													<string>(:include include:)&#10;(:auto also:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-42</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
                                                                                                         <variant>2</variant>
-													<string>:)&#10;&#10;&#10;!!Acknowledgements&#10;&#10;Peter Dimov has been continuously influencing the design and evolution of Boost Exception. Also thanks to Tobias Schwinger, Tom Brinkman, Pavel Vozenilek and everyone who participated in the review process.&#10;</string>
+													<string>(:include include:)&#10;(:auto also:)&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-44</id>
+														<id>-36</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
                                                                                                         <size>1</size>
                                                                                                         <variant>2</variant>
-													<string>(:auto !:)&#10;&#10;(:pagelist fmt=&quot;index&quot; except_tags=&quot;index,noindex&quot; mod=&quot;w&quot;:)&#10;</string>
+													<string>(:include include:)&#10;(:auto also:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>44</id>
+														<type>
+															<string>reno_context</string>
+														</type>
+														<object>
+															<hook>
+																<hook>
+																	<stream_hook_path>
+																		<container>
+																			<size>1</size>
+																			<strong>E444EE9697EEADFDE0767E1D0242FC0E70D98E61FB1F0FFA099648DE509B82F3</strong>
+																			<weak>94503238</weak>
+																			<size>773</size>
+																			<position>374</position>
+																		</container>
+																	</stream_hook_path>
+																</hook>
+																<file>
+																	<path>
+																		<empty>0</empty>
+																		<string>../../example/info_tuple.cpp</string>
+																		<type>0</type>
+																		<base>0</base>
+																	</path>
+																</file>
+															</hook>
+															<title>
+																<string>adding grouped data to exceptions</string>
+															</title>
+															<file_name>
+																<string>grouping_data</string>
+															</file_name>
+														</object>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                 </sorted>
@@ -2456,7 +2456,18 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@template &lt;class Tag,class T&gt;&#10;class&#10;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-9</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&#10;    {&#10;    public:&#10;&#10;    typedef T value_type;&#10;&#10;    error_info( value_type const &amp; );&#10;    };@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -2687,7 +2698,36 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>7</size>
+													<variant>2</variant>
+													<string>[@class&#10;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-30</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&#10;    {&#10;    protected:&#10;&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-6</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl pre_indent=&quot;4&quot;:)&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-12</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl pre_indent=&quot;4&quot;:)&#10;    };@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -2742,39 +2782,6 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@template &lt;class Tag,class T&gt;&#10;class&#10;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&#10;    {&#10;    public:&#10;&#10;    typedef T value_type;&#10;&#10;    error_info( value_type const &amp; );&#10;    };@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-36</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-37</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
                                                                                                         <size>0</size>
                                                                                                 </container>
                                                                                         </pair>
@@ -2782,7 +2789,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-38</id>
+														<id>-39</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -2793,7 +2800,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-39</id>
+														<id>-40</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -2804,7 +2811,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-40</id>
+														<id>-38</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -2812,43 +2819,36 @@
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-41</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>7</size>
-													<variant>2</variant>
-													<string>[@class&#10;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-41</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&#10;    {&#10;    protected:&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-29</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl pre_indent=&quot;4&quot;:)&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-18</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl pre_indent=&quot;4&quot;:)&#10;    };@]&#10;</string>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-41</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-43</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-37</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -2866,7 +2866,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-43</id>
+														<id>-36</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -2939,54 +2939,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>11</size>
-													<variant>2</variant>
-													<string>[@(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-41</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> def:)&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)&#10;&#10;typedef (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&lt;struct tag_throw_function,char const *&gt; throw_function;&#10;typedef (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&lt;struct tag_throw_file,char const *&gt; throw_file;&#10;typedef (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&lt;struct tag_throw_line,int&gt; throw_line;@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -2997,54 +2950,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>11</size>
-													<variant>2</variant>
-													<string>[@(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-7</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-33</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-14</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-22</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-15</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -3055,14 +2961,23 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
+													<size>5</size>
                                                                                                         <variant>2</variant>
                                                                                                         <string>[@(:include </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-6</id>
+															<id>-9</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> def:)&#10;&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-5</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3077,27 +2992,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>5</size>
-													<variant>2</variant>
-													<string>[@(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-23</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-38</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)&#10;    }@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -3108,18 +3003,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -3163,18 +3047,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-34</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl:)@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -3207,23 +3080,14 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>5</size>
+													<size>3</size>
                                                                                                         <variant>2</variant>
                                                                                                         <string>[@(:include </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> def:)&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-25</id>
+															<id>-18</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3238,69 +3102,61 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
+													<size>11</size>
                                                                                                         <variant>2</variant>
                                                                                                         <string>[@(:include </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-11</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string> decl:)@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-21</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
+													<string> decl:)&#10;&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-22</id>
+														</shared_ptr>
+													</weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>[@(:include </string>
+													<string> decl:)&#10;&#10;(:include </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-26</id>
+															<id>-39</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string> decl:)@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-22</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-23</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
+													<string> decl:)&#10;&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-7</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl:)&#10;&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-40</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl:)@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-24</id>
+														<id>-21</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3311,7 +3167,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-30</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3322,18 +3178,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-25</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-26</id>
+														<id>-22</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3344,67 +3189,80 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-27</id>
+														<id>-23</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>15</size>
+													<size>5</size>
                                                                                                         <variant>2</variant>
-													<string>[@#include &lt;(:link </string>
+													<string>[@(:include </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-24</id>
+															<id>-14</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;(:link </string>
+													<string> decl:)&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-12</id>
+															<id>-27</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;(:link </string>
+													<string> decl:)&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-24</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>11</size>
+													<variant>2</variant>
+													<string>[@(:include </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;(:link </string>
+													<string> def:)&#10;&#10;(:include </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-16</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;(:link </string>
+													<string> decl:)&#10;&#10;typedef (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;(:link </string>
+													<string>:)&lt;struct tag_throw_function,char const *&gt; throw_function;&#10;typedef (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-10</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;(:link </string>
+													<string>:)&lt;struct tag_throw_file,char const *&gt; throw_file;&#10;typedef (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
@@ -3413,14 +3271,14 @@
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;@]&#10;</string>
+													<string>:)&lt;struct tag_throw_line,int&gt; throw_line;@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-28</id>
+														<id>-25</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3431,7 +3289,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-29</id>
+														<id>-26</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3442,7 +3300,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-30</id>
+														<id>-27</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3453,7 +3311,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-31</id>
+														<id>-28</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3464,7 +3322,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-32</id>
+														<id>-29</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3475,7 +3333,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-33</id>
+														<id>-30</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3486,7 +3344,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-34</id>
+														<id>-31</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3497,7 +3355,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-35</id>
+														<id>-32</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3508,29 +3366,51 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-36</id>
+														<id>-33</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-38</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl:)@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-37</id>
+														<id>-34</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-36</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl:)@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-38</id>
+														<id>-35</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3563,65 +3443,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-41</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-42</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-43</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-44</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-										</sorted>
-									</object>
-								</shared_ptr>
-							</pair>
-							<pair>
-								<string>decl</string>
-								<shared_ptr>
-									<id>47</id>
-									<type>
-										<string>reno_layer</string>
-									</type>
-									<object>
-										<sorted>
-											<size>40</size>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-5</id>
+														<id>-38</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3632,89 +3454,105 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-6</id>
+														<id>-41</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>7</size>
+													<size>15</size>
                                                                                                         <variant>2</variant>
-													<string>[@template &lt;class E, class Tag1, class T1, ..., class TagN, class TN&gt;&#10;E const &amp; (:link </string>
+													<string>[@#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-6</id>
+															<id>-42</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string> mod=&quot;/&quot;:)( E const &amp; x,&#10;    (:link http://www.boost.org/libs/tuple/doc/tuple_users_guide.html|tuple:)&lt;&#10;        (:link </string>
+													<string>:)&gt;&#10;#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;Tag1,T1&gt;,&#10;        ...,&#10;        (:link </string>
+													<string>:)&gt;&#10;#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-24</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;TagN,TN&gt; &gt; const &amp; v );@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-7</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>5</size>
+													<string>:)&gt;&#10;#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-34</id>
+														</shared_ptr>
+													</weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>[@class&#10;(:link </string>
+													<string>:)&gt;&#10;#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-7</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:):&#10;    public std::exception&#10;    public boost::</string>
+													<string>:)&gt;&#10;#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-19</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>&#10;    {&#10;    ---unspecified---&#10;    };@]&#10;</string>
+													<string>:)&gt;&#10;#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-20</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-8</id>
+														<id>-43</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-37</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl:)@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-9</id>
+														<id>-37</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3725,18 +3563,29 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-10</id>
+														<id>-42</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl:)@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-11</id>
+														<id>-36</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3747,113 +3596,134 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-12</id>
+														<id>-44</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
                                                                                                         <size>0</size>
                                                                                                 </container>
                                                                                         </pair>
+										</sorted>
+									</object>
+								</shared_ptr>
+							</pair>
+							<pair>
+								<string>decl</string>
+								<shared_ptr>
+									<id>47</id>
+									<type>
+										<string>reno_layer</string>
+									</type>
+									<object>
+										<sorted>
+											<size>40</size>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-13</id>
+														<id>-5</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
+													<size>5</size>
                                                                                                         <variant>2</variant>
-													<string>[@template &lt;class T&gt;&#10;---unspecified--- (:link </string>
+													<string>[@template &lt;class E, class Tag, class T&gt;&#10;E const &amp; (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-5</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)( T const &amp; e );@]&#10;</string>
+													<string> mod=&quot;/&quot;:)( E const &amp; x, (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-9</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&lt;Tag,T&gt; const &amp; v );@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-14</id>
+														<id>-6</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>5</size>
+													<size>7</size>
                                                                                                         <variant>2</variant>
-													<string>[@template &lt;class T&gt;&#10;(:link </string>
+													<string>[@(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-6</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) (:link </string>
+													<string> mod=&quot;m&quot;:)();&#10;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-14</id>
+															<id>-6</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)( T const &amp; e );@]&#10;</string>
+													<string> mod=&quot;m&quot;:)( (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-30</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) const &amp; x );@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-15</id>
+														<id>-7</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
                                                                                                         <size>5</size>
                                                                                                         <variant>2</variant>
-													<string>[@void (:link </string>
+													<string>[@(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-15</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)( (:link </string>
+													<string>:) (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) const &amp; ep );</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-16</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
+													<string>:)();@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-17</id>
+														<id>-8</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3864,40 +3734,29 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-18</id>
+														<id>-9</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
-													<string>[@(:link </string>
+													<string>[@template &lt;class Tag,class T&gt;&#10;class (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-18</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string> mod=&quot;m&quot;:)();@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-19</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
+													<string>:);@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-20</id>
+														<id>-10</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3908,49 +3767,71 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-21</id>
+														<id>-11</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>5</size>
+													<variant>2</variant>
+													<string>[@class&#10;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-11</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:):&#10;    public std::exception&#10;    public boost::</string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-30</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>&#10;    {&#10;    ---unspecified---&#10;    };@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-22</id>
+														<id>-12</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>5</size>
+													<size>3</size>
                                                                                                         <variant>2</variant>
                                                                                                         <string>[@(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-22</id>
+															<id>-12</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)();@]&#10;</string>
+													<string> mod=&quot;m&quot;:)();@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-23</id>
+														<id>-13</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-14</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -3961,7 +3842,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-24</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3970,7 +3851,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-23</id>
+															<id>-14</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3979,7 +3860,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-38</id>
+															<id>-27</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3988,7 +3869,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-26</id>
+															<id>-37</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -3997,7 +3878,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-24</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4006,45 +3887,138 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-24</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>|throw_file:)(__FILE__) &lt;&lt;\&#10;        ::boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-24</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>|throw_file:)(__FILE__) &lt;&lt;\&#10;        ::boost::(:link </string>
+													<string>|throw_line:)((int)__LINE__) )&#10;#else&#10;    #define </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-14</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>(x) ::boost::</string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-27</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>(x)&#10;#endif@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-15</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>5</size>
+													<variant>2</variant>
+													<string>[@std::string (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-15</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)( boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-30</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) const &amp; x );@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-16</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-17</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-18</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>7</size>
+													<variant>2</variant>
+													<string>[@template &lt;class E, class Tag1, class T1, ..., class TagN, class TN&gt;&#10;E const &amp; (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-18</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>|throw_line:)((int)__LINE__) )&#10;#else&#10;    #define </string>
+													<string> mod=&quot;/&quot;:)( E const &amp; x,&#10;    (:link http://www.boost.org/libs/tuple/doc/tuple_users_guide.html|tuple:)&lt;&#10;        (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-23</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>(x) ::boost::</string>
+													<string>:)&lt;Tag1,T1&gt;,&#10;        ...,&#10;        (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-38</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>(x)&#10;#endif@]&#10;</string>
+													<string>:)&lt;TagN,TN&gt; &gt; const &amp; v );@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-24</id>
+														<id>-19</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4055,60 +4029,51 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-25</id>
+														<id>-20</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>5</size>
-													<variant>2</variant>
-													<string>[@template &lt;class E, class Tag, class T&gt;&#10;E const &amp; (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-25</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> mod=&quot;/&quot;:)( E const &amp; x, (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&lt;Tag,T&gt; const &amp; v );@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-26</id>
+														<id>-21</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-22</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
-													<string>[@template &lt;class T&gt;&#10;---unspecified--- (:link </string>
+													<string>[@typedef ---unspecified--- (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-26</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)( T const &amp; x );@]&#10;</string>
+													<string>:);@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-27</id>
+														<id>-23</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4119,7 +4084,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-28</id>
+														<id>-24</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4130,78 +4095,60 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-29</id>
+														<id>-25</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>7</size>
-													<variant>2</variant>
-													<string>[@(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-29</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> mod=&quot;m&quot;:)();&#10;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-29</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> mod=&quot;m&quot;:)( (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-41</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) const &amp; x );@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-30</id>
+														<id>-26</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-27</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
                                                                                                         <size>5</size>
                                                                                                         <variant>2</variant>
-													<string>[@std::string (:link </string>
+													<string>[@#ifdef BOOST_NO_EXCEPTIONS&#10;    void (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-30</id>
+															<id>-27</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)( boost::(:link </string>
+													<string>:)( std::exception const &amp; e ); // user defined&#10;#else&#10;    template &lt;class E&gt;&#10;    void (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-27</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) const &amp; x );@]&#10;</string>
+													<string>:)( E const &amp; e );&#10;#endif@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-31</id>
+														<id>-28</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4212,7 +4159,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-32</id>
+														<id>-29</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4223,18 +4170,18 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-33</id>
+														<id>-30</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
-													<string>[@typedef ---unspecified--- (:link </string>
+													<string>[@class (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -4245,51 +4192,29 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-34</id>
+														<id>-31</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@template &lt;class ErrorInfo,class E&gt;&#10;(:link http://www.boost.org/libs/smart_ptr/shared_ptr.htm|shared_ptr:)&lt;typename ErrorInfo::value_type const&gt; (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-34</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)( E const &amp; x );@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-35</id>
+														<id>-32</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@template &lt;class Tag,class T&gt;&#10;class (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:);@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-36</id>
+														<id>-33</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4300,7 +4225,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-37</id>
+														<id>-34</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4311,22 +4236,86 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-38</id>
+														<id>-35</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-39</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
                                                                                                         <size>5</size>
                                                                                                         <variant>2</variant>
-													<string>[@#ifdef BOOST_NO_EXCEPTIONS&#10;    void (:link </string>
+													<string>[@template &lt;class T&gt;&#10;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-38</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)( std::exception const &amp; e ); // user defined&#10;#else&#10;    template &lt;class E&gt;&#10;    void (:link </string>
+													<string>:) (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-39</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)( T const &amp; e );@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-40</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>5</size>
+													<variant>2</variant>
+													<string>[@void (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-40</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)( (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-22</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) const &amp; ep );</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-38</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@template &lt;class T&gt;&#10;---unspecified--- (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
@@ -4335,14 +4324,14 @@
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)( E const &amp; e );&#10;#endif@]&#10;</string>
+													<string>:)( T const &amp; e );@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-39</id>
+														<id>-41</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4353,7 +4342,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-40</id>
+														<id>-43</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4364,22 +4353,22 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-41</id>
+														<id>-37</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
-													<string>[@class (:link </string>
+													<string>[@template &lt;class T&gt;&#10;---unspecified--- (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-37</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:);@]&#10;</string>
+													<string>:)( T const &amp; x );@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -4397,11 +4386,22 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-43</id>
+														<id>-36</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@template &lt;class ErrorInfo,class E&gt;&#10;(:link http://www.boost.org/libs/smart_ptr/shared_ptr.htm|shared_ptr:)&lt;typename ErrorInfo::value_type const&gt; (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-36</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)( E const &amp; x );@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -4437,491 +4437,419 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>15</size>
+													<size>7</size>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;Boost Exception responds to the following configuration macros:&#10;&#10;&apos;&apos;&apos;BOOST_NO_RTTI&apos;&apos;&apos;\\&#10;&apos;&apos;&apos;BOOST_NO_TYPEID&apos;&apos;&apos;&#10;&#10;The first macro prevents Boost Exception from using dynamic_cast and dynamic typeid. If the second macro is also defined, Boost Exception does not use static typeid either. There are no observable degrading effects on the library functionality, except for the following:&#10;&#10;-&gt;By default, the (:link </string>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;E must be boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-34</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) function template can be called with any exception type. If BOOST_NO_RTTI is defined, (:link </string>
+													<string>:), or a type that derives (indirectly) from boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-34</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) can be used only with objects of type boost::(:link </string>
+													<string>:).&#10;&#10;!!!!Effects:&#10;&#10;Stores a copy of v into x. If x already contains data of type (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:).&#10;&#10;&apos;&apos;&apos;BOOST_EXCEPTION_DISABLE&apos;&apos;&apos;&#10;&#10;By default, (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-13</id>
-														</shared_ptr>
-													</weak_ptr>
+													<string>:)&lt;Tag,T&gt;, that data is overwritten.&#10;&#10;!!!!Returns:&#10;&#10;x.&#10;&#10;(:include throws:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-6</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>7</size>
                                                                                                         <variant>2</variant>
-													<string>:) and (:link </string>
+													<string>(:auto !!!:)&#10;&#10;(:include decl:)&#10;&#10;!!!!Effects:&#10;&#10;* Default constructor: initializes an empty boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-26</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) are integrated directly in the (:link </string>
+													<string>:) object.&#10;* Copy constructor: initializes a boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-38</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) function. Defining BOOST_EXCEPTION_DISABLE disables this integration.&#10;&#10;Note that on some non-conformant compilers, for example MSVC 7.0 and older, as well as BCC, BOOST_EXCEPTION_DISABLE is implicitly defined in (:link </string>
+													<string>:) object which shares ownership with x of all data added through (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-11</id>
+															<id>-5</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:).&#10;</string>
+													<string> mod=&quot;/&quot;:), including data that is added at a future time.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-6</id>
+														<id>-7</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>5</size>
+													<size>29</size>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;E must be boost::(:link </string>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;The (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:), or a type that derives (indirectly) from boost::(:link </string>
+													<string>:) function must not be called outside of a catch block.&#10;&#10;!!!!Returns:&#10;&#10;* An (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:).&#10;&#10;!!!!Effects:&#10;&#10;Equivalent to x &lt;&lt; v.(:link http://www.boost.org/libs/tuple/doc/tuple_users_guide.html#accessing_elements|get:)&lt;0&gt;() &lt;&lt; ... &lt;&lt; v.(:link http://www.boost.org/libs/tuple/doc/tuple_users_guide.html#accessing_elements|get:)&lt;N&gt;().&#10;&#10;!!!!Returns:&#10;&#10;x.&#10;&#10;(:include throws:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-7</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>5</size>
+													<string>:) that refers to the currently handled exception or a copy of the currently handled exception.&#10;* If the function needs to allocate memory and the attempt fails, it returns an (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-22</id>
+														</shared_ptr>
+													</weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;This type is used by the (:link </string>
+													<string>:) that refers to an instance of std::bad_alloc.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;&#10;!!!!Notes:&#10;&#10;* It is unspecified whether the return values of two successive calls to (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) support in Boost Exception. Please see (:link </string>
+													<string>:) refer to the same exception object.&#10;* Correct implementation of (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-22</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:).&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-8</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
+													<string>:) may require compiler support, unless (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-38</id>
+														</shared_ptr>
+													</weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-9</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
+													<string>:) was used at the time the currently handled exception object was passed to throw. If (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-38</id>
+														</shared_ptr>
+													</weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-10</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
+													<string>:) was not used, and if the compiler does not provide the necessary support, then (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-7</id>
+														</shared_ptr>
+													</weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-11</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
+													<string>:) may return an (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-22</id>
+														</shared_ptr>
+													</weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-12</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
+													<string>:) that refers to an instance of (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-11</id>
+														</shared_ptr>
+													</weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-13</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>21</size>
+													<string>:). In this case, if the original exception object derives from boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-30</id>
+														</shared_ptr>
+													</weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;T must be a class with an accessible no-throw copy constructor.&#10;&#10;!!!!Returns:&#10;&#10;An object of &apos;&apos;unspecified&apos;&apos; type which derives publicly from T. That is, the returned object can be intercepted by a catch(T &amp;).&#10;&#10;!!!!Description:&#10;&#10;&#10;&#10;This function is designed to be used directly in a throw-expression to enable the (:link </string>
+													<string>:), then the boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) support in Boost Exception. For example:&#10;&#10;[@class&#10;my_exception:&#10;    public std::exception&#10;    {&#10;    };&#10;&#10;....&#10;throw boost::(:link </string>
+													<string>:) sub-object of the (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-11</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)(my_exception());@]&#10;&#10;Unless (:link </string>
+													<string>:) object is initialized by the boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) is called at the time an exception object is used in a throw-expression, an attempt to copy it using (:link </string>
+													<string>:) copy constructor.&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-8</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>15</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;Boost Exception responds to the following configuration macros:&#10;&#10;&apos;&apos;&apos;BOOST_NO_RTTI&apos;&apos;&apos;\\&#10;&apos;&apos;&apos;BOOST_NO_TYPEID&apos;&apos;&apos;&#10;&#10;The first macro prevents Boost Exception from using dynamic_cast and dynamic typeid. If the second macro is also defined, Boost Exception does not use static typeid either. There are no observable degrading effects on the library functionality, except for the following:&#10;&#10;-&gt;By default, the (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-22</id>
+															<id>-36</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) may return an (:link </string>
+													<string>:) function template can be called with any exception type. If BOOST_NO_RTTI is defined, (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-36</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) which refers to an instance of (:link </string>
+													<string>:) can be used only with objects of type boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-7</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:). See (:link </string>
+													<string>:).&#10;&#10;&apos;&apos;&apos;BOOST_EXCEPTION_DISABLE&apos;&apos;&apos;&#10;&#10;By default, (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-22</id>
+															<id>-38</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) for details.&#10;&#10;!!!!Note:&#10;&#10;Instead of using the throw keyword directly, it is preferable to call boost::(:link </string>
+													<string>:) and (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-38</id>
+															<id>-37</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:). This is guaranteed to throw an exception that derives from boost::(:link </string>
+													<string>:) are integrated directly in the (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-27</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) and supports the (:link </string>
+													<string>:) function. Defining BOOST_EXCEPTION_DISABLE disables this integration.&#10;&#10;Note that on some non-conformant compilers, for example MSVC 7.0 and older, as well as BCC, BOOST_EXCEPTION_DISABLE is implicitly defined in (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-23</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) functionality.&#10;</string>
+													<string>:).&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-14</id>
+														<id>-9</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>5</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Effects:&#10;&#10;As if&#10;&#10;[@try&#10;    {&#10;    throw </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-13</id>
-														</shared_ptr>
-													</weak_ptr>
+													<size>25</size>
                                                                                                         <variant>2</variant>
-													<string>(e);&#10;    }&#10;catch(...)&#10;    {&#10;    return (:link </string>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;T must have accessible copy constructor and must not be a reference (there is no requirement that T&apos;s copy constructor does not throw.)&#10;&#10;!!!!Description:&#10;&#10;This class template is used to associate a Tag type with a value type T. Objects of type (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-22</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)();&#10;    }@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-15</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Precondition:&#10;&#10;ep shall not be null.&#10;&#10;!!!!Throws:&#10;&#10;&#10;&#10;The exception to which ep refers.&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-16</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-17</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>21</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;Sometimes the throw site does not have all the information that is needed at the catch site to make sense of what went wrong. Here is an example:&#10;&#10;[@#include &lt;stdio.h&gt;&#10;#include &lt;string&gt;&#10;        &#10;class&#10;file_read_error&#10;    {&#10;    public:&#10;&#10;    explicit&#10;    file_read_error( std::string const &amp; fn ):&#10;        fn_(fn)&#10;        {&#10;        };&#10;&#10;    std::string const &amp;&#10;    file_name() const&#10;        {&#10;        return fn_;&#10;        }&#10;&#10;    private:&#10;&#10;    std::string fn_;&#10;    };&#10;&#10;void&#10;file_read( FILE * f, void * buffer, size_t size )&#10;    {&#10;    if( size!=fread(buffer,1,size,f) )&#10;        throw file_read_error(&quot;????&quot;);&#10;    }@]&#10;&#10;We have defined an exception class file_read_error which can store a file name, so that when we catch a file_read_error object, we know which file the failure is related to. However, the file_read func
tion does not have the file name at the time of the throw; all it has is a FILE handle.&#10;&#10;One possible solution is to not use FILE handles directly. We could have our own class file which stores both a FILE handle and a file name, and pass that to file_read. However, this could be problematic if we communicate with 3rd party code that does not use our class file (probably because they have their own similar class.)&#10;&#10;A better solution is to make class file_read_error derive (possibly indirectly) from boost::(:link </string>
+													<string>:)&lt;Tag,T&gt; can be passed to (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-5</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:), and free the file_read function from the burden of storing the file name in exceptions it throws:&#10;&#10;[@#include &lt;(:link </string>
+													<string> mod=&quot;/&quot;:) to be stored in objects of type boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-27</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;stdio.h&gt;&#10;#include &lt;errno.h&gt;&#10;&#10;typedef boost::(:link </string>
+													<string>:).&#10;&#10;!!!!Note:&#10;&#10;The header &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;struct tag_errno,int&gt; errno_info;&#10;&#10;class file_read_error: public boost::(:link </string>
+													<string>:)&gt; provides a declaration of the (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) { };&#10;&#10;void&#10;file_read( FILE * f, void * buffer, size_t size )&#10;    {&#10;    if( size!=fread(buffer,1,size,f) )&#10;        throw file_read_error() &lt;&lt; errno_info(errno);&#10;    }@]&#10;&#10;If file_read detects a failure, it throws an exception which contains the information that is available at the time, namely the errno. Other relevant information, such as the file name, can be added in a context higher up the call stack, where it is known naturally:&#10;&#10;[@#include &lt;(:link </string>
+													<string>:) template, which is sufficient for the purpose of typedefing an instance for specific Tag and T, like this:&#10;&#10;[@#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-27</id>
+															<id>-21</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;boost/shared_ptr.hpp&gt;&#10;#include &lt;stdio.h&gt;&#10;#include &lt;string&gt;&#10;&#10;typedef boost::(:link </string>
+													<string>:)&gt;&#10;&#10;typedef boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;struct tag_file_name,std::string&gt; file_name_info;&#10;&#10;boost::shared_ptr&lt;FILE&gt; file_open( char const * file_name, char const * mode );&#10;void file_read( FILE * f, void * buffer, size_t size );&#10;&#10;void&#10;parse_file( char const * file_name )&#10;    {&#10;    boost::shared_ptr&lt;FILE&gt; f = file_open(file_name,&quot;rb&quot;);&#10;    assert(f);&#10;    try&#10;        {&#10;        char buf[1024];&#10;        file_read( f.get(), buf, sizeof(buf) );&#10;        }&#10;    catch(&#10;    boost::(:link </string>
+													<string>:)&lt;struct tag_errno,int&gt; errno_info;@]&#10;&#10;Of course, to actually add an (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) &amp; e )&#10;        {&#10;        e &lt;&lt; file_name_info(file_name);&#10;        throw;&#10;        }&#10;    }@]&#10;&#10;The above function is (almost) exception-neutral -- if an exception is emitted by any function call within the try block, parse_file does not need to do any real work, but it intercepts any boost::(:link </string>
+													<string>:) object to (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) object, stores the file name, and re-throws using a throw-expression with no operand (15.1.6). The rationale for catching any boost::(:link </string>
+													<string> mod=&quot;p&quot;:) using (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-5</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) object is that the file name is relevant to any failure that occurs in parse_file, &apos;&apos;even if the failure is unrelated to file I/O&apos;&apos;.&#10;&#10;As usual, the stored data can be retrieved using (:link </string>
+													<string> mod=&quot;/&quot;:), or to retrieve it using (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-34</id>
+															<id>-36</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:).&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-18</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include decl:)&#10;&#10;!!!!Effects:&#10;&#10;&#10;&#10;Frees all resources associated with a boost::(:link </string>
+													<string>:), you must first #include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) object.&#10;&#10;!!!!Throws:&#10;&#10;&#10;&#10;Nothing.&#10;</string>
+													<string>:)&gt;.&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-19</id>
+														<id>-10</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -4934,75 +4862,13 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-20</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-21</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-22</id>
+														<id>-11</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>29</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;The (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-22</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) function must not be called outside of a catch block.&#10;&#10;!!!!Returns:&#10;&#10;* An (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-33</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) that refers to the currently handled exception or a copy of the currently handled exception.&#10;* If the function needs to allocate memory and the attempt fails, it returns an (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-33</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) that refers to an instance of std::bad_alloc.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;&#10;!!!!Notes:&#10;&#10;* It is unspecified whether the return values of two successive calls to (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-22</id>
-														</shared_ptr>
-													</weak_ptr>
+													<size>5</size>
                                                                                                         <variant>2</variant>
-													<string>:) refer to the same exception object.&#10;* Correct implementation of (:link </string>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;This type is used by the (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
@@ -5011,95 +4877,103 @@
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) may require compiler support, unless (:link </string>
+													<string>:) support in Boost Exception. Please see (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) was used at the time the currently handled exception object was passed to throw. If (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-13</id>
-														</shared_ptr>
-													</weak_ptr>
+													<string>:).&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-12</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>3</size>
                                                                                                         <variant>2</variant>
-													<string>:) was not used, and if the compiler does not provide the necessary support, then (:link </string>
+													<string>(:auto !!!:)&#10;&#10;(:include decl:)&#10;&#10;!!!!Effects:&#10;&#10;&#10;&#10;Frees all resources associated with a boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-22</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) may return an (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-33</id>
-														</shared_ptr>
-													</weak_ptr>
+													<string>:) object.&#10;&#10;!!!!Throws:&#10;&#10;&#10;&#10;Nothing.&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-13</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>11</size>
                                                                                                         <variant>2</variant>
-													<string>:) that refers to an instance of (:link </string>
+													<string>(:auto !!:)&#10;&#10;Boost Exception supports transporting of exception objects between threads through cloning. This system is similar to (:link http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2179.html|N2179:), but because Boost Exception can not rely on language support, the use of (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-7</id>
+															<id>-38</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:). In this case, if the original exception object derives from boost::(:link </string>
+													<string>:) at the time of the throw is required in order to use cloning.&#10;&#10;!!!!Note:&#10;&#10;All exceptions emitted by the familiar function boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-27</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:), then the boost::(:link </string>
+													<string>:) are guaranteed to derive from boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) sub-object of the (:link </string>
+													<string>:) and to support cloning.&#10;&#10;(:include </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-7</id>
+															<id>-31</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) object is initialized by the boost::(:link </string>
+													<string>:)&#10;(:include </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-16</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) copy constructor.&#10;</string>
+													<string>:)&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-23</id>
+														<id>-14</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5110,7 +4984,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-38</id>
+															<id>-27</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5119,7 +4993,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-34</id>
+															<id>-36</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5128,7 +5002,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-30</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5139,104 +5013,47 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-24</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-25</id>
+														<id>-15</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
                                                                                                         <size>7</size>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;E must be boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-41</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:), or a type that derives (indirectly) from boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-41</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:).&#10;&#10;!!!!Effects:&#10;&#10;Stores a copy of v into x. If x already contains data of type (:link </string>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Returns:&#10;&#10;This function iterates over all data objects stored in the boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;Tag,T&gt;, that data is overwritten.&#10;&#10;!!!!Returns:&#10;&#10;x.&#10;&#10;(:include throws:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-26</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>5</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;T must be a class with an accessible no-throw copy constructor as per (15.5.1).&#10;&#10;!!!!Returns:&#10;&#10;* If T derives from boost::(:link </string>
+													<string>:) through (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-5</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:), the returned object is of type T and is a copy of x.&#10;* Otherwise, the returned object is of an unspecified type that derives publicly from both T and boost::(:link </string>
+													<string> mod=&quot;/&quot;:). The returned string is constructed by converting each data object to string and then concatenating these strings together.&#10;&#10;When the (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:). The T sub-object is initialized from x by the T copy constructor.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-27</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
+													<string>:)&lt;Tag,T&gt; template is instantiated, the system attempts overload resolution for an unqualified call to to_string(x), where x is of type T. If this is successful, the to_string overload is expected to return std::string and is used to convert objects of type T to string.&#10;&#10;Otherwise, the system attempts overload resolution for s &lt;&lt; x, where s is a std::ostringstream and x is of type T. If this is successful, the operator&lt;&lt; overload is used to convert objects of type T to string.&#10;&#10;Otherwise the system is unable to convert objects of type T to string, and an unspecified stub string value is used without issuing a compile error.&#10;&#10;!!!!Notes:&#10;&#10;*The format of the returned string is unspecified.&#10;*The returned string is &apos;&apos;not&apos;&apos; user-friendly.&#10;*If dynamic_cast&lt;std::exception const *&gt;(&amp;x) is not null, the returned string includes the output from std::exception::what.&#10;*The returned string may include addition
al platform-specific diagnostic information.&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-28</id>
+														<id>-16</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5247,7 +5064,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-22</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5256,7 +5073,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5265,7 +5082,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-20</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5274,7 +5091,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5283,7 +5100,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5292,7 +5109,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5301,7 +5118,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-22</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5310,7 +5127,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-22</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5319,7 +5136,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-15</id>
+															<id>-40</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5328,7 +5145,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5337,7 +5154,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-15</id>
+															<id>-40</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5346,7 +5163,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-22</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5355,7 +5172,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5364,7 +5181,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-38</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5373,7 +5190,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5382,7 +5199,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-7</id>
+															<id>-11</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5391,7 +5208,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-22</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5400,7 +5217,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-15</id>
+															<id>-40</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5411,53 +5228,22 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-29</id>
+														<id>-17</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>7</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include decl:)&#10;&#10;!!!!Effects:&#10;&#10;* Default constructor: initializes an empty boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-41</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:) object.&#10;* Copy constructor: initializes a boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-41</id>
-														</shared_ptr>
-													</weak_ptr>
+													<size>21</size>
                                                                                                         <variant>2</variant>
-													<string>:) object which shares ownership with x of all data added through (:link </string>
+													<string>(:auto !!!:)&#10;&#10;Sometimes the throw site does not have all the information that is needed at the catch site to make sense of what went wrong. Here is an example:&#10;&#10;[@#include &lt;stdio.h&gt;&#10;#include &lt;string&gt;&#10;        &#10;class&#10;file_read_error&#10;    {&#10;    public:&#10;&#10;    explicit&#10;    file_read_error( std::string const &amp; fn ):&#10;        fn_(fn)&#10;        {&#10;        };&#10;&#10;    std::string const &amp;&#10;    file_name() const&#10;        {&#10;        return fn_;&#10;        }&#10;&#10;    private:&#10;&#10;    std::string fn_;&#10;    };&#10;&#10;void&#10;file_read( FILE * f, void * buffer, size_t size )&#10;    {&#10;    if( size!=fread(buffer,1,size,f) )&#10;        throw file_read_error(&quot;????&quot;);&#10;    }@]&#10;&#10;We have defined an exception class file_read_error which can store a file name, so that when we catch a file_read_error object, we know which file the failure is related to. However, the file_read func
tion does not have the file name at the time of the throw; all it has is a FILE handle.&#10;&#10;One possible solution is to not use FILE handles directly. We could have our own class file which stores both a FILE handle and a file name, and pass that to file_read. However, this could be problematic if we communicate with 3rd party code that does not use our class file (probably because they have their own similar class.)&#10;&#10;A better solution is to make class file_read_error derive (possibly indirectly) from boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-25</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string> mod=&quot;/&quot;:), including data that is added at a future time.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-30</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>7</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Returns:&#10;&#10;This function iterates over all data objects stored in the boost::(:link </string>
+													<string>:), and free the file_read function from the burden of storing the file name in exceptions it throws:&#10;&#10;[@#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
@@ -5466,56 +5252,25 @@
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) through (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-25</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> mod=&quot;/&quot;:). The returned string is constructed by converting each data object to string and then concatenating these strings together.&#10;&#10;When the (:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-35</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&lt;Tag,T&gt; template is instantiated, the system attempts overload resolution for an unqualified call to to_string(x), where x is of type T. If this is successful, the to_string overload is expected to return std::string and is used to convert objects of type T to string.&#10;&#10;Otherwise, the system attempts overload resolution for s &lt;&lt; x, where s is a std::ostringstream and x is of type T. If this is successful, the operator&lt;&lt; overload is used to convert objects of type T to string.&#10;&#10;Otherwise the system is unable to convert objects of type T to string, and an unspecified stub string value is used without issuing a compile error.&#10;&#10;!!!!Notes:&#10;&#10;*The format of the returned string is unspecified.&#10;*The returned string is &apos;&apos;not&apos;&apos; user-friendly.&#10;*If dynamic_cast&lt;std::exception const *&gt;(&amp;x) is not null, the returned string includes the output from std::exception::what.&#10;*The returned string may include addition
al platform-specific diagnostic information.&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-31</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>11</size>
-													<variant>2</variant>
-													<string>(:auto !!:)&#10;&#10;Boost Exception supports transporting of exception objects between threads through cloning. This system is similar to (:link http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2179.html|N2179:), but because Boost Exception can not rely on language support, the use of (:link </string>
+													<string>:)&gt;&#10;#include &lt;stdio.h&gt;&#10;#include &lt;errno.h&gt;&#10;&#10;typedef boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) at the time of the throw is required in order to use cloning.&#10;&#10;!!!!Note:&#10;&#10;All exceptions emitted by the familiar function boost::(:link </string>
+													<string>:)&lt;struct tag_errno,int&gt; errno_info;&#10;&#10;class file_read_error: public boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-38</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) are guaranteed to derive from boost::(:link </string>
+													<string>:) { };&#10;&#10;void&#10;file_read( FILE * f, void * buffer, size_t size )&#10;    {&#10;    if( size!=fread(buffer,1,size,f) )&#10;        throw file_read_error() &lt;&lt; errno_info(errno);&#10;    }@]&#10;&#10;If file_read detects a failure, it throws an exception which contains the information that is available at the time, namely the errno. Other relevant information, such as the file name, can be added in a context higher up the call stack, where it is known naturally:&#10;&#10;[@#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
@@ -5524,99 +5279,129 @@
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) and to support cloning.&#10;&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-42</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&#10;(:include </string>
+													<string>:)&gt;&#10;#include &lt;boost/shared_ptr.hpp&gt;&#10;#include &lt;stdio.h&gt;&#10;#include &lt;string&gt;&#10;&#10;typedef boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-28</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-32</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>13</size>
+													</weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;The code snippet below demonstrates how boost::(:link http://www.boost.org/libs/tuple/doc/tuple_users_guide.html|tuple:) can be used to bundle the name of the function that failed, together with the reported errno so that they can be added to exception objects more conveniently together:&#10;&#10;[@#include &lt;(:link </string>
+													<string>:)&lt;struct tag_file_name,std::string&gt; file_name_info;&#10;&#10;boost::shared_ptr&lt;FILE&gt; file_open( char const * file_name, char const * mode );&#10;void file_read( FILE * f, void * buffer, size_t size );&#10;&#10;void&#10;parse_file( char const * file_name )&#10;    {&#10;    boost::shared_ptr&lt;FILE&gt; f = file_open(file_name,&quot;rb&quot;);&#10;    assert(f);&#10;    try&#10;        {&#10;        char buf[1024];&#10;        file_read( f.get(), buf, sizeof(buf) );&#10;        }&#10;    catch(&#10;    boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-10</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;boost/shared_ptr.hpp&gt;&#10;#include &lt;stdio.h&gt;&#10;#include &lt;string&gt;&#10;#include &lt;errno.h&gt;&#10;&#10;typedef boost::(:link </string>
+													<string>:) &amp; e )&#10;        {&#10;        e &lt;&lt; file_name_info(file_name);&#10;        throw;&#10;        }&#10;    }@]&#10;&#10;The above function is (almost) exception-neutral -- if an exception is emitted by any function call within the try block, parse_file does not need to do any real work, but it intercepts any boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;struct tag_file_name,std::string&gt; file_name_info;&#10;typedef boost::(:link </string>
+													<string>:) object, stores the file name, and re-throws using a throw-expression with no operand (15.1.6). The rationale for catching any boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;struct tag_function,char const *&gt; function_info;&#10;typedef boost::(:link </string>
+													<string>:) object is that the file name is relevant to any failure that occurs in parse_file, &apos;&apos;even if the failure is unrelated to file I/O&apos;&apos;.&#10;&#10;As usual, the stored data can be retrieved using (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-36</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;struct tag_errno,int&gt; errno_info;&#10;typedef boost::tuple&lt;function_info,errno_info&gt; clib_failure;&#10;&#10;class file_open_error: public boost::(:link </string>
+													<string>:).&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-18</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>5</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;E must be boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) { };&#10;&#10;boost::shared_ptr&lt;FILE&gt;&#10;file_open( char const * name, char const * mode )&#10;    {&#10;    if( FILE * f=fopen(name,mode) )&#10;        return boost::shared_ptr&lt;FILE&gt;(f,fclose);&#10;    else&#10;        throw file_open_error() &lt;&lt;&#10;            file_name_info(name) &lt;&lt;&#10;            clib_failure(&quot;fopen&quot;,errno);&#10;    }@]&#10;&#10;Note that the members of a boost::(:link http://www.boost.org/libs/tuple/doc/tuple_users_guide.html|tuple:) are stored separately in exception objects; they can only be retrieved individually, using (:link </string>
+													<string>:), or a type that derives (indirectly) from boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-34</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:).&#10;</string>
+													<string>:).&#10;&#10;!!!!Effects:&#10;&#10;Equivalent to x &lt;&lt; v.(:link http://www.boost.org/libs/tuple/doc/tuple_users_guide.html#accessing_elements|get:)&lt;0&gt;() &lt;&lt; ... &lt;&lt; v.(:link http://www.boost.org/libs/tuple/doc/tuple_users_guide.html#accessing_elements|get:)&lt;N&gt;().&#10;&#10;!!!!Returns:&#10;&#10;x.&#10;&#10;(:include throws:)&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-33</id>
+														<id>-19</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-20</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-21</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-22</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -5627,7 +5412,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5636,7 +5421,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5645,7 +5430,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5654,7 +5439,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5663,7 +5448,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5672,7 +5457,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-33</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5681,7 +5466,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-22</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5690,7 +5475,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-15</id>
+															<id>-40</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -5701,58 +5486,84 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-34</id>
+														<id>-23</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>13</size>
+													<size>1</size>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;* ErrorInfo must be an instance of the (:link </string>
+													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-24</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-25</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>17</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;The following example demonstrates how errno can be stored in exception objects using Boost Exception:&#10;&#10;[@#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-41</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) template.&#10;* E must be polymorphic.&#10;* The (:link </string>
+													<string>:)&gt;&#10;#include &lt;errno.h&gt;&#10;#include &lt;iostream&gt;&#10;&#10;typedef boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-34</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) function must not be called outside of a catch block.&#10;&#10;!!!!Returns:&#10;&#10;* If dynamic_cast&lt;boost::(:link </string>
+													<string>:)&lt;struct tag_errno,int&gt; errno_info; //(1)&#10;&#10;class my_error: public boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) const *&gt;(&amp;x) is 0, or if x does not store an object of type ErrorInfo, the returned value is an empty shared_ptr.&#10;* Otherwise, the returned shared_ptr points to the stored value (use (:link </string>
+													<string>:), public std::exception { }; //(2)&#10;&#10;void&#10;f()&#10;    {&#10;    throw my_error() &lt;&lt; errno_info(errno); //(3)&#10;    }&#10;@]&#10;&#10;First, we instantiate the (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-25</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string> mod=&quot;/&quot;:) to store values in exception objects.) The shared_ptr is valid even after x has been destroyed.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;&#10;!!!!Note:&#10;&#10;The interface of (:link </string>
+													<string>:) template using a unique identifier -- tag_errno, and the type of the info it identifies -- int. This provides compile-time type safety for the various values stored in exception objects.&#10;&#10;Second, we define class my_error, which derives from boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-34</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) may be affected by the build (:link </string>
+													<string>:).&#10;&#10;Finally, (3) illustrates how the typedef from (1) can be used with (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
@@ -5761,38 +5572,65 @@
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:).&#10;</string>
+													<string>|operator&lt;&lt;:) to store values in exception objects at the point of the throw.&#10;&#10;The stored errno value can be recovered at a later time like this:&#10;&#10;[@// ...continued&#10;&#10;void&#10;g()&#10;    {&#10;    try&#10;        {&#10;        f();&#10;        }&#10;    catch(&#10;    my_error &amp; x )&#10;        {&#10;        if( boost::shared_ptr&lt;int const&gt; err=boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-36</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&lt;errno_info&gt;(x) )&#10;            std::cerr &lt;&lt; &quot;Error code: &quot; &lt;&lt; *err;&#10;        }&#10;    }@]&#10;&#10;The (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-36</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) function template is instantiated with the typedef from (1), and is passed an exception object of a polymorphic type. If the exception object contains the requested value, the returned (:link http://www.boost.org/libs/smart_ptr/shared_ptr.htm|shared_ptr:) will point to it; otherwise an empty (:link http://www.boost.org/libs/smart_ptr/shared_ptr.htm|shared_ptr:) is returned.&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-35</id>
+														<id>-26</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>25</size>
+													<size>27</size>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;T must have accessible copy constructor and must not be a reference (there is no requirement that T&apos;s copy constructor does not throw.)&#10;&#10;!!!!Description:&#10;&#10;This class template is used to associate a Tag type with a value type T. Objects of type (:link </string>
+													<string>(:auto !!:)&#10;&#10;Some exception hierarchies can not be modified to make boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;Tag,T&gt; can be passed to (:link </string>
+													<string>:) a base type. In this case, the (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-25</id>
+															<id>-37</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string> mod=&quot;/&quot;:) to be stored in objects of type boost::(:link </string>
+													<string>:) function template can be used to make exception objects derive from boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-30</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) anyway. Here is an example:&#10;&#10;[@#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
@@ -5801,101 +5639,128 @@
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:).&#10;&#10;!!!!Note:&#10;&#10;The header &lt;(:link </string>
+													<string>:)&gt;&#10;#include &lt;stdexcept&gt;&#10;&#10;typedef boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-12</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt; provides a declaration of the (:link </string>
+													<string>:)&lt;struct tag_std_range_min,size_t&gt; std_range_min;&#10;typedef boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) template, which is sufficient for the purpose of typedefing an instance for specific Tag and T, like this:&#10;&#10;[@#include &lt;(:link </string>
+													<string>:)&lt;struct tag_std_range_max,size_t&gt; std_range_max;&#10;typedef boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-12</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;&#10;typedef boost::(:link </string>
+													<string>:)&lt;struct tag_std_range_index,size_t&gt; std_range_index;&#10;&#10;template &lt;class T&gt;&#10;class&#10;my_container&#10;    {&#10;    public:&#10;&#10;    size_t size() const;&#10;&#10;    T const &amp;&#10;    operator[]( size_t i ) const&#10;        {&#10;        if( i &gt; size() )&#10;            throw boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;struct tag_errno,int&gt; errno_info;@]&#10;&#10;Of course, to actually add an (:link </string>
+													<string>:)(std::range_error(&quot;Index out of range&quot;)) &lt;&lt;&#10;                std_range_min(0) &lt;&lt;&#10;                std_range_max(size()) &lt;&lt;&#10;                std_range_index(i);&#10;        //....&#10;        }&#10;    };&#10;@]&#10;&#10;The call to (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-37</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) object to (:link </string>
+													<string>:)&lt;T&gt; gets us an object of &apos;&apos;unspecified type&apos;&apos; which is guaranteed to derive from both boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string> mod=&quot;p&quot;:) using (:link </string>
+													<string>:) and T. This makes it possible to use (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-25</id>
+															<id>-5</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string> mod=&quot;/&quot;:), or to retrieve it using (:link </string>
+													<string> mod=&quot;/&quot;:) to store additional information in the exception object. The exception can be intercepted as T &amp;, so existing exception handling will not break. It can also be intercepted as boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-34</id>
+															<id>-30</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) &amp;, so that (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-28</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>|more information can be added to the exception at a later time:).&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-27</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>13</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;E must derive publicly from std::exception.&#10;&#10;!!!!Effects:&#10;&#10;* If BOOST_NO_EXCEPTIONS is not defined, boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-27</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)(e) is equivalent to throw boost::(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-38</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:), you must first #include &lt;(:link </string>
+													<string>:)(boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-37</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;.&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-36</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>17</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;The following example demonstrates how errno can be stored in exception objects using Boost Exception:&#10;&#10;[@#include &lt;(:link </string>
+													<string>:)(e)), unless BOOST_EXCEPTION_DISABLE is defined, in which case boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
@@ -5904,43 +5769,56 @@
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;errno.h&gt;&#10;#include &lt;iostream&gt;&#10;&#10;typedef boost::(:link </string>
+													<string>:)(e) is equivalent to throw e;&#10;* If BOOST_NO_EXCEPTIONS is defined, the function is left undefined, and the user is expected to supply an appropriate definition. Callers of (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-27</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;struct tag_errno,int&gt; errno_info; //(1)&#10;&#10;class my_error: public boost::(:link </string>
+													<string>:) are allowed to assume that the function never returns; therefore, if the user-defined (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-27</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:), public std::exception { }; //(2)&#10;&#10;void&#10;f()&#10;    {&#10;    throw my_error() &lt;&lt; errno_info(errno); //(3)&#10;    }&#10;@]&#10;&#10;First, we instantiate the (:link </string>
+													<string>:) returns, the behavior is undefined.&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-28</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>11</size>
+													<variant>2</variant>
+													<string>(:auto !!:)&#10;&#10;All exception types that derive from boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) template using a unique identifier -- tag_errno, and the type of the info it identifies -- int. This provides compile-time type safety for the various values stored in exception objects.&#10;&#10;Second, we define class my_error, which derives from boost::(:link </string>
+													<string>:) can be used as type-safe containers of arbitrary data objects, while complying with the no-throw requirements (15.5.1) of the ANSI C++ standard for exception types. Data can be added to a boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:).&#10;&#10;Finally, (3) illustrates how the typedef from (1) can be used with (:link </string>
+													<string>:) at the time of the throw, or at a later time.&#10;&#10;(:include </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
@@ -5949,195 +5827,208 @@
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>|operator&lt;&lt;:) to store values in exception objects at the point of the throw.&#10;&#10;The stored errno value can be recovered at a later time like this:&#10;&#10;[@// ...continued&#10;&#10;void&#10;g()&#10;    {&#10;    try&#10;        {&#10;        f();&#10;        }&#10;    catch(&#10;    my_error &amp; x )&#10;        {&#10;        if( boost::shared_ptr&lt;int const&gt; err=boost::(:link </string>
+													<string>:)&#10;(:include </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-34</id>
+															<id>-17</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;errno_info&gt;(x) )&#10;            std::cerr &lt;&lt; &quot;Error code: &quot; &lt;&lt; *err;&#10;        }&#10;    }@]&#10;&#10;The (:link </string>
+													<string>:)&#10;(:include </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-34</id>
+															<id>-44</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) function template is instantiated with the typedef from (1), and is passed an exception object of a polymorphic type. If the exception object contains the requested value, the returned (:link http://www.boost.org/libs/smart_ptr/shared_ptr.htm|shared_ptr:) will point to it; otherwise an empty (:link http://www.boost.org/libs/smart_ptr/shared_ptr.htm|shared_ptr:) is returned.&#10;</string>
+													<string>:)&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-37</id>
+														<id>-29</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>27</size>
+													<size>17</size>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!:)&#10;&#10;Some exception hierarchies can not be modified to make boost::(:link </string>
+													<string>(:auto !!:)&#10;&#10;Boost Exception provides a namespace-scope function (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) a base type. In this case, the (:link </string>
+													<string>:) which takes a boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-26</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) function template can be used to make exception objects derive from boost::(:link </string>
+													<string>:). The returned string contains:&#10;&#10;*the string representation of all data objects added to the boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) anyway. Here is an example:&#10;&#10;[@#include &lt;(:link </string>
+													<string>:) through (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-27</id>
+															<id>-5</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;stdexcept&gt;&#10;&#10;typedef boost::(:link </string>
+													<string> mod=&quot;/&quot;:);&#10;*the output from std::exception::what;&#10;*additional platform-specific diagnostic information.&#10;&#10;The returned string is not presentable as a friendly user message, but because it is generated automatically, it is useful for debugging or logging purposes. Here is an example:&#10;&#10;[@#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-41</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;struct tag_std_range_min,size_t&gt; std_range_min;&#10;typedef boost::(:link </string>
+													<string>:)&gt;&#10;#include &lt;iostream&gt;&#10;&#10;void f(); //throws unknown types that derive from boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;struct tag_std_range_max,size_t&gt; std_range_max;&#10;typedef boost::(:link </string>
+													<string>:).&#10;&#10;void&#10;g()&#10;    {&#10;    try&#10;        {&#10;        f();&#10;        }&#10;    catch(&#10;    boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;struct tag_std_range_index,size_t&gt; std_range_index;&#10;&#10;template &lt;class T&gt;&#10;class&#10;my_container&#10;    {&#10;    public:&#10;&#10;    size_t size() const;&#10;&#10;    T const &amp;&#10;    operator[]( size_t i ) const&#10;        {&#10;        if( i &gt; size() )&#10;            throw boost::(:link </string>
+													<string>:) &amp; e )&#10;        {&#10;        std::cerr &lt;&lt; (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-26</id>
+															<id>-15</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)(std::range_error(&quot;Index out of range&quot;)) &lt;&lt;&#10;                std_range_min(0) &lt;&lt;&#10;                std_range_max(size()) &lt;&lt;&#10;                std_range_index(i);&#10;        //....&#10;        }&#10;    };&#10;@]&#10;&#10;The call to (:link </string>
+													<string>:)(e);&#10;        }&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-30</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>13</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;Class boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-26</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&lt;T&gt; gets us an object of &apos;&apos;unspecified type&apos;&apos; which is guaranteed to derive from both boost::(:link </string>
+													<string>:) is designed to be used as a universal base for user-defined exception types.&#10;&#10;An object of any type deriving from boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) and T. This makes it possible to use (:link </string>
+													<string>:) can store data of arbitrary types, using the (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-25</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string> mod=&quot;/&quot;:) to store additional information in the exception object. The exception can be intercepted as T &amp;, so existing exception handling will not break. It can also be intercepted as boost::(:link </string>
+													<string>:) wrapper and (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-5</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) &amp;, so that (:link </string>
+													<string> mod=&quot;/&quot;:).&#10;&#10;To retrieve data from a boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-39</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>|more information can be added to the exception at a later time:).&#10;</string>
+													<string>:) object, use the (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-36</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) function template.&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-38</id>
+														<id>-31</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>13</size>
-													<variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;E must derive publicly from std::exception.&#10;&#10;!!!!Effects:&#10;&#10;* If BOOST_NO_EXCEPTIONS is not defined, boost::(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-38</id>
-														</shared_ptr>
-													</weak_ptr>
+													<size>11</size>
                                                                                                         <variant>2</variant>
-													<string>:)(e) is equivalent to throw boost::(:link </string>
+													<string>(:auto !!!:)&#10;&#10;Here is how cloning can be enabled in a throw-expression (15.1):&#10;&#10;[@#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)(boost::(:link </string>
+													<string>:)&gt;&#10;#include &lt;stdio.h&gt;&#10;#include &lt;errno.h&gt;&#10;&#10;typedef boost::error_info&lt;struct tag_errno,int&gt; errno_info;&#10;&#10;class file_read_error: public boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-26</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)(e)), unless BOOST_EXCEPTION_DISABLE is defined, in which case boost::(:link </string>
+													<string>:) { };&#10;&#10;void&#10;file_read( FILE * f, void * buffer, size_t size )&#10;    {&#10;    if( size!=fread(buffer,1,size,f) )&#10;        throw boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
@@ -6146,7 +6037,7 @@
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)(e) is equivalent to throw e;&#10;* If BOOST_NO_EXCEPTIONS is defined, the function is left undefined, and the user is expected to supply an appropriate definition. Callers of (:link </string>
+													<string>:)(file_read_error()) &lt;&lt;&#10;            errno_info(errno);&#10;    }@]&#10;&#10;Of course, (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
@@ -6155,16 +6046,64 @@
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) are allowed to assume that the function never returns; therefore, if the user-defined (:link </string>
+													<string>:) may be used with any exception type; there is no requirement that it should derive from boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-38</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) returns, the behavior is undefined.&#10;</string>
+													<string>:).&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-32</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-33</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-34</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-35</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -6175,130 +6114,191 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>11</size>
+													<size>5</size>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!:)&#10;&#10;All exception types that derive from boost::(:link </string>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Effects:&#10;&#10;As if&#10;&#10;[@try&#10;    {&#10;    throw </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-38</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) can be used as type-safe containers of arbitrary data objects, while complying with the no-throw requirements (15.5.1) of the ANSI C++ standard for exception types. Data can be added to a boost::(:link </string>
+													<string>(e);&#10;    }&#10;catch(...)&#10;    {&#10;    return (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-7</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)();&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-40</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Precondition:&#10;&#10;ep shall not be null.&#10;&#10;!!!!Throws:&#10;&#10;&#10;&#10;The exception to which ep refers.&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-38</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>21</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;T must be a class with an accessible no-throw copy constructor.&#10;&#10;!!!!Returns:&#10;&#10;An object of &apos;&apos;unspecified&apos;&apos; type which derives publicly from T. That is, the returned object can be intercepted by a catch(T &amp;).&#10;&#10;!!!!Description:&#10;&#10;&#10;&#10;This function is designed to be used directly in a throw-expression to enable the (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) at the time of the throw, or at a later time.&#10;&#10;(:include </string>
+													<string>:) support in Boost Exception. For example:&#10;&#10;[@class&#10;my_exception:&#10;    public std::exception&#10;    {&#10;    };&#10;&#10;....&#10;throw boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-36</id>
+															<id>-38</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&#10;(:include </string>
+													<string>:)(my_exception());@]&#10;&#10;Unless (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-17</id>
+															<id>-38</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&#10;(:include </string>
+													<string>:) is called at the time an exception object is used in a throw-expression, an attempt to copy it using (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-32</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-40</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>17</size>
-													<variant>2</variant>
-													<string>(:auto !!:)&#10;&#10;Boost Exception provides a namespace-scope function (:link </string>
+													<string>:) may return an (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-30</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) which takes a boost::(:link </string>
+													<string>:) which refers to an instance of (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-11</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:). The returned string contains:&#10;&#10;*the string representation of all data objects added to the boost::(:link </string>
+													<string>:). See (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-7</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) through (:link </string>
+													<string>:) for details.&#10;&#10;!!!!Note:&#10;&#10;Instead of using the throw keyword directly, it is preferable to call boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-25</id>
+															<id>-27</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string> mod=&quot;/&quot;:);&#10;*the output from std::exception::what;&#10;*additional platform-specific diagnostic information.&#10;&#10;The returned string is not presentable as a friendly user message, but because it is generated automatically, it is useful for debugging or logging purposes. Here is an example:&#10;&#10;[@#include &lt;(:link </string>
+													<string>:). This is guaranteed to throw an exception that derives from boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-27</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;iostream&gt;&#10;&#10;void f(); //throws unknown types that derive from boost::(:link </string>
+													<string>:) and supports the (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-22</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:).&#10;&#10;void&#10;g()&#10;    {&#10;    try&#10;        {&#10;        f();&#10;        }&#10;    catch(&#10;    boost::(:link </string>
+													<string>:) functionality.&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-41</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-43</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-37</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>5</size>
+													<variant>2</variant>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;T must be a class with an accessible no-throw copy constructor as per (15.5.1).&#10;&#10;!!!!Returns:&#10;&#10;* If T derives from boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) &amp; e )&#10;        {&#10;        std::cerr &lt;&lt; (:link </string>
+													<string>:), the returned object is of type T and is a copy of x.&#10;* Otherwise, the returned object is of an unspecified type that derives publicly from both T and boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
@@ -6307,87 +6307,100 @@
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)(e);&#10;        }&#10;    }@]&#10;</string>
+													<string>:). The T sub-object is initialized from x by the T copy constructor.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-41</id>
+														<id>-42</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>1</size>
+													<variant>2</variant>
+													<string>(:auto !!:)&#10;&#10;!!!Synopsis&#10;&#10;(:include synopsis:)&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-36</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
                                                                                                         <size>13</size>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;Class boost::(:link </string>
+													<string>(:auto !!!:)&#10;&#10;(:include synopsis:)&#10;&#10;!!!!Requirements:&#10;&#10;* ErrorInfo must be an instance of the (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) is designed to be used as a universal base for user-defined exception types.&#10;&#10;An object of any type deriving from boost::(:link </string>
+													<string>:) template.&#10;* E must be polymorphic.&#10;* The (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-36</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) can store data of arbitrary types, using the (:link </string>
+													<string>:) function must not be called outside of a catch block.&#10;&#10;!!!!Returns:&#10;&#10;* If dynamic_cast&lt;boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-35</id>
+															<id>-30</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) wrapper and (:link </string>
+													<string>:) const *&gt;(&amp;x) is 0, or if x does not store an object of type ErrorInfo, the returned value is an empty shared_ptr.&#10;* Otherwise, the returned shared_ptr points to the stored value (use (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-25</id>
+															<id>-5</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string> mod=&quot;/&quot;:).&#10;&#10;To retrieve data from a boost::(:link </string>
+													<string> mod=&quot;/&quot;:) to store values in exception objects.) The shared_ptr is valid even after x has been destroyed.&#10;&#10;!!!!Throws:&#10;&#10;Nothing.&#10;&#10;!!!!Note:&#10;&#10;The interface of (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-36</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) object, use the (:link </string>
+													<string>:) may be affected by the build (:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-34</id>
+															<id>-8</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) function template.&#10;</string>
+													<string>:).&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-42</id>
+														<id>-44</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>11</size>
+													<size>13</size>
                                                                                                         <variant>2</variant>
-													<string>(:auto !!!:)&#10;&#10;Here is how cloning can be enabled in a throw-expression (15.1):&#10;&#10;[@#include &lt;(:link </string>
+													<string>(:auto !!!:)&#10;&#10;The code snippet below demonstrates how boost::(:link http://www.boost.org/libs/tuple/doc/tuple_users_guide.html|tuple:) can be used to bundle the name of the function that failed, together with the reported errno so that they can be added to exception objects more conveniently together:&#10;&#10;[@#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
@@ -6396,67 +6409,54 @@
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;stdio.h&gt;&#10;#include &lt;errno.h&gt;&#10;&#10;typedef boost::error_info&lt;struct tag_errno,int&gt; errno_info;&#10;&#10;class file_read_error: public boost::(:link </string>
+													<string>:)&gt;&#10;#include &lt;boost/shared_ptr.hpp&gt;&#10;#include &lt;stdio.h&gt;&#10;#include &lt;string&gt;&#10;#include &lt;errno.h&gt;&#10;&#10;typedef boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) { };&#10;&#10;void&#10;file_read( FILE * f, void * buffer, size_t size )&#10;    {&#10;    if( size!=fread(buffer,1,size,f) )&#10;        throw boost::(:link </string>
+													<string>:)&lt;struct tag_file_name,std::string&gt; file_name_info;&#10;typedef boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)(file_read_error()) &lt;&lt;&#10;            errno_info(errno);&#10;    }@]&#10;&#10;Of course, (:link </string>
+													<string>:)&lt;struct tag_function,char const *&gt; function_info;&#10;typedef boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-13</id>
+															<id>-9</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:) may be used with any exception type; there is no requirement that it should derive from boost::(:link </string>
+													<string>:)&lt;struct tag_errno,int&gt; errno_info;&#10;typedef boost::tuple&lt;function_info,errno_info&gt; clib_failure;&#10;&#10;class file_open_error: public boost::(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-41</id>
+															<id>-30</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:) { };&#10;&#10;boost::shared_ptr&lt;FILE&gt;&#10;file_open( char const * name, char const * mode )&#10;    {&#10;    if( FILE * f=fopen(name,mode) )&#10;        return boost::shared_ptr&lt;FILE&gt;(f,fclose);&#10;    else&#10;        throw file_open_error() &lt;&lt;&#10;            file_name_info(name) &lt;&lt;&#10;            clib_failure(&quot;fopen&quot;,errno);&#10;    }@]&#10;&#10;Note that the members of a boost::(:link http://www.boost.org/libs/tuple/doc/tuple_users_guide.html|tuple:) are stored separately in exception objects; they can only be retrieved individually, using (:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-36</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
                                                                                                         <string>:).&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-43</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-44</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
-												</container>
-											</pair>
                                                                                 </sorted>
                                                                         </object>
                                                                 </shared_ptr>
@@ -6479,7 +6479,9 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>1</size>
+													<variant>2</variant>
+													<string>!!!!Throws:&#10;&#10;std::bad_alloc, or any exception emitted by the T copy constructor.&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -6490,9 +6492,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>!!!!Throws:&#10;&#10;std::bad_alloc, or any exception emitted by T1..TN copy constructor.&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -6624,7 +6624,9 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>1</size>
+													<variant>2</variant>
+													<string>!!!!Throws:&#10;&#10;std::bad_alloc, or any exception emitted by T1..TN copy constructor.&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -6701,9 +6703,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>!!!!Throws:&#10;&#10;std::bad_alloc, or any exception emitted by the T copy constructor.&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -6820,7 +6820,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-36</id>
+														<id>-39</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -6831,7 +6831,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-37</id>
+														<id>-40</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -6853,7 +6853,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-39</id>
+														<id>-41</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -6864,7 +6864,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-40</id>
+														<id>-43</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -6875,7 +6875,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-41</id>
+														<id>-37</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -6897,7 +6897,7 @@
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-43</id>
+														<id>-36</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
@@ -6937,18 +6937,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-6</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>5</size>
+													<size>3</size>
                                                                                                         <variant>2</variant>
                                                                                                         <string>`#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
@@ -6959,16 +6948,18 @@
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-6</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string> decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>:)&gt;\\&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-6</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -6986,7 +6977,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-20</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7001,9 +6992,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>[@namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7016,16 +7005,16 @@
                                                                                                 <container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
-													<string>[@#include &lt;(:link </string>
+													<string>`#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-10</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include def pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7036,9 +7025,18 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>1</size>
+													<size>3</size>
                                                                                                         <variant>2</variant>
-													<string>[@#include &lt;boost/tuple/tuple.hpp&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>[@#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-24</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;#include &lt;boost/current_function.hpp&gt;&#10;#include &lt;boost/shared_ptr.hpp&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7049,9 +7047,18 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>1</size>
+													<size>3</size>
                                                                                                         <variant>2</variant>
-													<string>(:include api:)&#10;</string>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-20</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7062,9 +7069,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>[@namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7075,18 +7080,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#include &lt;</string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-20</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7099,16 +7093,16 @@
                                                                                                 <container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
-													<string>`#include &lt;(:link </string>
+													<string>`#include &lt;</string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-23</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>&gt;&#10;&#10;(:include decl:)&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7126,11 +7120,11 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-42</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>:)&gt;\\&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7141,9 +7135,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>1</size>
-													<variant>2</variant>
-													<string>[@#include &lt;boost/shared_ptr.hpp&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7165,7 +7157,27 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>5</size>
+													<variant>2</variant>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-19</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-18</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7176,18 +7188,9 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-8</id>
-														</shared_ptr>
-													</weak_ptr>
+													<size>1</size>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;#include &lt;boost/current_function.hpp&gt;&#10;#include &lt;boost/shared_ptr.hpp&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>[@#include &lt;boost/tuple/tuple.hpp&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7200,16 +7203,16 @@
                                                                                                 <container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
-													<string>[@#include &lt;</string>
+													<string>[@#include &lt;(:link </string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-24</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>:)&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7220,18 +7223,9 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@#include &lt;</string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-8</id>
-														</shared_ptr>
-													</weak_ptr>
+													<size>1</size>
                                                                                                         <variant>2</variant>
-													<string>&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>[@namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7249,7 +7243,7 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-20</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
@@ -7264,18 +7258,9 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#include &lt;</string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-11</id>
-														</shared_ptr>
-													</weak_ptr>
+													<size>1</size>
                                                                                                         <variant>2</variant>
-													<string>&gt;&#10;&#10;(:include decl:)&#10;</string>
+													<string>(:include api:)&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7286,18 +7271,9 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>[@#include &lt;string&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-41</id>
-														</shared_ptr>
-													</weak_ptr>
+													<size>1</size>
                                                                                                         <variant>2</variant>
-													<string> decl pre_indent=&quot;4&quot;:)&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>[@namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7308,18 +7284,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#include &lt;(:link </string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-19</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>:)&gt;\\&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7330,18 +7295,7 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#include &lt;</string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-21</id>
-														</shared_ptr>
-													</weak_ptr>
-													<variant>2</variant>
-													<string>&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<size>0</size>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7352,9 +7306,18 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>1</size>
+													<size>3</size>
                                                                                                         <variant>2</variant>
-													<string>[@(:include api:)@]&#10;</string>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-23</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7398,7 +7361,7 @@
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;\\&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include def pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7433,16 +7396,16 @@
                                                                                                 <container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
-													<string>`#include &lt;(:link </string>
+													<string>[@#include &lt;</string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-9</id>
+															<id>-24</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7453,18 +7416,9 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>3</size>
-													<variant>2</variant>
-													<string>`#include &lt;</string>
-													<variant>1</variant>
-													<weak_ptr>
-														<expired>0</expired>
-														<shared_ptr>
-															<id>-16</id>
-														</shared_ptr>
-													</weak_ptr>
+													<size>1</size>
                                                                                                         <variant>2</variant>
-													<string>&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>[@#include &lt;boost/shared_ptr.hpp&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7475,6 +7429,17 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
+													<size>0</size>
+												</container>
+											</pair>
+											<pair>
+												<weak_ptr>
+													<expired>0</expired>
+													<shared_ptr>
+														<id>-39</id>
+													</shared_ptr>
+												</weak_ptr>
+												<container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
                                                                                                         <string>`#include &lt;(:link </string>
@@ -7482,33 +7447,33 @@
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-19</id>
+															<id>-20</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include def pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
-												</container>
-											</pair>
-											<pair>
-												<weak_ptr>
-													<expired>0</expired>
-													<shared_ptr>
-														<id>-36</id>
-													</shared_ptr>
-												</weak_ptr>
-												<container>
-													<size>0</size>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-37</id>
+														<id>-40</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>`#include &lt;(:link </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-20</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7521,60 +7486,73 @@
                                                                                                 <container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
-													<string>`#include &lt;(:link </string>
+													<string>`#include &lt;</string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-11</id>
+															<id>-33</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl:)&#10;    }@]&#10;</string>
+													<string>&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-39</id>
+														<id>-41</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>1</size>
+													<variant>2</variant>
+													<string>[@(:include api:)@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-40</id>
+														<id>-43</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@#include &lt;</string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-24</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-41</id>
+														<id>-37</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
                                                                                                         <size>3</size>
                                                                                                         <variant>2</variant>
-													<string>`#include &lt;(:link </string>
+													<string>`#include &lt;</string>
                                                                                                         <variant>1</variant>
                                                                                                         <weak_ptr>
                                                                                                                 <expired>0</expired>
                                                                                                                 <shared_ptr>
-															<id>-8</id>
+															<id>-43</id>
                                                                                                                 </shared_ptr>
                                                                                                         </weak_ptr>
                                                                                                         <variant>2</variant>
-													<string>:)&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include def pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
+													<string>&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7585,18 +7563,40 @@
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>[@#include &lt;string&gt;&#10;&#10;namespace&#10;boost&#10;    {&#10;(:include </string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-30</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string> decl pre_indent=&quot;4&quot;:)&#10;(:include api pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
                                                                                                 <weak_ptr>
                                                                                                         <expired>0</expired>
                                                                                                         <shared_ptr>
-														<id>-43</id>
+														<id>-36</id>
                                                                                                         </shared_ptr>
                                                                                                 </weak_ptr>
                                                                                                 <container>
-													<size>0</size>
+													<size>3</size>
+													<variant>2</variant>
+													<string>`#include &lt;</string>
+													<variant>1</variant>
+													<weak_ptr>
+														<expired>0</expired>
+														<shared_ptr>
+															<id>-34</id>
+														</shared_ptr>
+													</weak_ptr>
+													<variant>2</variant>
+													<string>&gt;&#10;&#10;[@namespace&#10;boost&#10;    {&#10;(:include decl pre_indent=&quot;4&quot;:)&#10;    }@]&#10;</string>
                                                                                                 </container>
                                                                                         </pair>
                                                                                         <pair>
@@ -7722,28 +7722,28 @@
                                                                         <id>-35</id>
                                                                 </shared_ptr>
                                                                 <shared_ptr>
-									<id>-36</id>
+									<id>-39</id>
                                                                 </shared_ptr>
                                                                 <shared_ptr>
-									<id>-37</id>
+									<id>-40</id>
                                                                 </shared_ptr>
                                                                 <shared_ptr>
                                                                         <id>-38</id>
                                                                 </shared_ptr>
                                                                 <shared_ptr>
-									<id>-39</id>
+									<id>-41</id>
                                                                 </shared_ptr>
                                                                 <shared_ptr>
-									<id>-40</id>
+									<id>-43</id>
                                                                 </shared_ptr>
                                                                 <shared_ptr>
-									<id>-41</id>
+									<id>-37</id>
                                                                 </shared_ptr>
                                                                 <shared_ptr>
                                                                         <id>-42</id>
                                                                 </shared_ptr>
                                                                 <shared_ptr>
-									<id>-43</id>
+									<id>-36</id>
                                                                 </shared_ptr>
                                                                 <shared_ptr>
                                                                         <id>-44</id>
@@ -7767,7 +7767,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-43</id>
+										<id>-35</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -7784,7 +7784,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-31</id>
+										<id>-13</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -7801,7 +7801,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-39</id>
+										<id>-28</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -7818,7 +7818,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-44</id>
+										<id>-32</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -7835,7 +7835,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-21</id>
+										<id>-43</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -7852,6 +7852,58 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
+										<id>-33</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>2</size>
+												<strong>391956879B098B05CB774BAD3285881434482FD633818A579F7183052E6BAD09</strong>
+												<weak>1787869209</weak>
+												<size>3656</size>
+												<position>504</position>
+												<strong>BB8AF986C96801345719855FEA083AF5684FBC349F6520E150F19A6370019265</strong>
+												<weak>3731478139</weak>
+												<size>686</size>
+												<position>2964</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/get_error_info.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-36</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>1</size>
+												<strong>FBC69CDA5E19FA40270F3855A8B99B2F77572439353F9DC5D15386F3520BC616</strong>
+												<weak>1405483403</weak>
+												<size>8882</size>
+												<position>323</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception_ptr.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
                                                                                 <id>-20</id>
                                                                         </shared_ptr>
                                                                 </pair>
@@ -7876,7 +7928,31 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-28</id>
+										<id>-16</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<container>
+												<size>1</size>
+												<strong>7CAF5D62B1ED0802B65B428119DBDD84C352A24A98EB167E1B0681F3E8DD7628</strong>
+												<weak>3711957388</weak>
+												<size>3837</size>
+												<position>323</position>
+											</container>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/get_error_info.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-34</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -7900,7 +7976,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-37</id>
+										<id>-26</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -7924,7 +8000,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-19</id>
+										<id>-10</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -7935,7 +8011,7 @@
                                                                                                 <strong>17FF6C63843EE64ED66CB038DD95B4C4D6BA1B0FD36B27BEFD84A909161D2853</strong>
                                                                                                 <weak>1237535165</weak>
                                                                                                 <size>231</size>
-												<position>1171</position>
+												<position>1186</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
@@ -7948,7 +8024,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-23</id>
+										<id>-14</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -7976,7 +8052,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-30</id>
+										<id>-15</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8000,31 +8076,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-40</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>1</size>
-												<strong>F6A7A960DE8CB8740E206D2585D4C83854DE073ABDAFFB8BD1C9A6B73428197D</strong>
-												<weak>129904804</weak>
-												<size>4115</size>
-												<position>323</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/get_error_info.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-16</id>
+										<id>-29</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8048,7 +8100,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-27</id>
+										<id>-41</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8072,7 +8124,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-24</id>
+										<id>-42</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8083,7 +8135,7 @@
                                                                                                 <strong>612485E090D76B2CC43C1A296F813075BA165C2496082E78E939F10B3DA8E09A</strong>
                                                                                                 <weak>1770110914</weak>
                                                                                                 <size>587</size>
-												<position>1482</position>
+												<position>1497</position>
                                                                                                 <strong>60F3F48B87487FA6E0D2CCC0750AF435CC92CEC80BBBF609AC71295031AADD0D</strong>
                                                                                                 <weak>3929437933</weak>
                                                                                                 <size>361</size>
@@ -8100,7 +8152,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-38</id>
+										<id>-27</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8111,7 +8163,7 @@
                                                                                                 <strong>612485E090D76B2CC43C1A296F813075BA165C2496082E78E939F10B3DA8E09A</strong>
                                                                                                 <weak>1770110914</weak>
                                                                                                 <size>587</size>
-												<position>1482</position>
+												<position>1497</position>
                                                                                                 <strong>60F3F48B87487FA6E0D2CCC0750AF435CC92CEC80BBBF609AC71295031AADD0D</strong>
                                                                                                 <weak>3929437933</weak>
                                                                                                 <size>361</size>
@@ -8132,35 +8184,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-5</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>2</size>
-												<strong>8F178D422EC1891AEDF90A4DCA7BCEC96D29D1B0A70726C222513D699679F59D</strong>
-												<weak>3253069900</weak>
-												<size>3913</size>
-												<position>525</position>
-												<strong>BB8AF986C96801345719855FEA083AF5684FBC349F6520E150F19A6370019265</strong>
-												<weak>3731478139</weak>
-												<size>686</size>
-												<position>3221</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/get_error_info.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-34</id>
+										<id>-8</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8188,31 +8212,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-35</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<container>
-												<size>1</size>
-												<strong>772781E5C169713B0AAF4BF73D567AB51C65D3D2DE185E43BDD75B8C3E0090AE</strong>
-												<weak>2533913088</weak>
-												<size>1998</size>
-												<position>91</position>
-											</container>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/throw_exception.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-11</id>
+										<id>-9</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8220,95 +8220,107 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>1</size>
-												<strong>CAD6C404CB725D336A44920D2341ECA131149AB02C368B59028F8147F16737BF</strong>
-												<weak>2258638601</weak>
-												<size>94</size>
-												<position>227</position>
+												<strong>55F1164770FD778354E151EF65A3E830DA20F325F7ED20A95130A4B83FC801BF</strong>
+												<weak>1282550303</weak>
+												<size>9192</size>
+												<position>323</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/info_tuple.hpp</string>
+											<string>../../../../boost/exception/exception.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-10</id>
+										<id>-24</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>1</size>
-												<strong>4ED9709788BBAB4DE7CF336561606B8C0B41F70877A3395F4EE026F4AEB66CC6</strong>
-												<weak>743998427</weak>
-												<size>409</size>
-												<position>307</position>
+												<size>2</size>
+												<strong>55F1164770FD778354E151EF65A3E830DA20F325F7ED20A95130A4B83FC801BF</strong>
+												<weak>1282550303</weak>
+												<size>9192</size>
+												<position>323</position>
+												<strong>17E691632123EB67BA67D590B49EB8094F462F5A10A66A1C5438E1867EF1478E</strong>
+												<weak>765399792</weak>
+												<size>77</size>
+												<position>5917</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../example/cloning_1.cpp</string>
+											<string>../../../../boost/exception/exception.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-42</id>
+										<id>-12</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>1</size>
-												<strong>25DF01CCA9425952104C6606C336BB091879E4A22680790BBB352670DFB0E0CD</strong>
-												<weak>4271502180</weak>
-												<size>8870</size>
+												<size>2</size>
+												<strong>55F1164770FD778354E151EF65A3E830DA20F325F7ED20A95130A4B83FC801BF</strong>
+												<weak>1282550303</weak>
+												<size>9192</size>
                                                                                                 <position>323</position>
+												<strong>DF9EA87B0140AACF4422F1B76F6A6A409C15F32858BBBA85A35981A824C56BA9</strong>
+												<weak>1137981799</weak>
+												<size>192</size>
+												<position>8994</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception_ptr.hpp</string>
+											<string>../../../../boost/exception/exception.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-9</id>
+										<id>-38</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>1</size>
-												<strong>F4C951B28F7DE500973AA3DFAA99F2BADA6EDAFA2B406C30BEF3B7FBE6FD57D7</strong>
-												<weak>2263754923</weak>
-												<size>982</size>
-												<position>306</position>
+												<size>2</size>
+												<strong>55F1164770FD778354E151EF65A3E830DA20F325F7ED20A95130A4B83FC801BF</strong>
+												<weak>1282550303</weak>
+												<size>9192</size>
+												<position>323</position>
+												<strong>F3FB15CD82336271C6E875BC620385322777D16F0B7C233300783CE35710CCBF</strong>
+												<weak>3292878997</weak>
+												<size>282</size>
+												<position>7305</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../example/error_info_2.cpp</string>
+											<string>../../../../boost/exception/exception.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-17</id>
+										<id>-37</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8316,139 +8328,131 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>2</size>
-												<strong>86E1196533E771AEFD141DA43FCD980AE3D7689A45EDD54A2DF28B1943E0E7DB</strong>
-												<weak>941210061</weak>
-												<size>8706</size>
-												<position>487</position>
-												<strong>E23085202D084CBB50F289988A6A592F06D923B77D0AB25D7A98A7188DF5BE3B</strong>
-												<weak>1414247481</weak>
-												<size>766</size>
-												<position>7370</position>
+												<strong>55F1164770FD778354E151EF65A3E830DA20F325F7ED20A95130A4B83FC801BF</strong>
+												<weak>1282550303</weak>
+												<size>9192</size>
+												<position>323</position>
+												<strong>65D35B8A2063883A53E9D0DCC3FF8E5CA3573A58451A653CDE3003FFBEC576D3</strong>
+												<weak>1693870740</weak>
+												<size>2195</size>
+												<position>3720</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception_ptr.hpp</string>
+											<string>../../../../boost/exception/exception.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-22</id>
+										<id>-30</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>2</size>
-												<strong>86E1196533E771AEFD141DA43FCD980AE3D7689A45EDD54A2DF28B1943E0E7DB</strong>
-												<weak>941210061</weak>
-												<size>8706</size>
-												<position>487</position>
-												<strong>F86EB07D04CD0D0645080D1121DA899746D0C45137E17E1D9BE605E75396F047</strong>
-												<weak>1983537541</weak>
-												<size>1346</size>
-												<position>148</position>
+												<size>3</size>
+												<strong>55F1164770FD778354E151EF65A3E830DA20F325F7ED20A95130A4B83FC801BF</strong>
+												<weak>1282550303</weak>
+												<size>9192</size>
+												<position>323</position>
+												<strong>65D35B8A2063883A53E9D0DCC3FF8E5CA3573A58451A653CDE3003FFBEC576D3</strong>
+												<weak>1693870740</weak>
+												<size>2195</size>
+												<position>3720</position>
+												<strong>DA154372D8C23BD9EDC30005CA7959CE686D198891097A837D006B5222F04DE9</strong>
+												<weak>2768248809</weak>
+												<size>143</size>
+												<position>60</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception_ptr.hpp</string>
+											<string>../../../../boost/exception/exception.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-33</id>
+										<id>-6</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>2</size>
-												<strong>86E1196533E771AEFD141DA43FCD980AE3D7689A45EDD54A2DF28B1943E0E7DB</strong>
-												<weak>941210061</weak>
-												<size>8706</size>
-												<position>487</position>
-												<strong>448B6444D4B3E46F822F56C14FDA3F6F96B869543EBA1E291C5E3D36F73AF24B</strong>
-												<weak>2443226110</weak>
-												<size>700</size>
-												<position>1496</position>
+												<size>1</size>
+												<strong>CAD6C404CB725D336A44920D2341ECA131149AB02C368B59028F8147F16737BF</strong>
+												<weak>2258638601</weak>
+												<size>94</size>
+												<position>227</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception_ptr.hpp</string>
+											<string>../../../../boost/exception/info_tuple.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-7</id>
+										<id>-19</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>2</size>
-												<strong>86E1196533E771AEFD141DA43FCD980AE3D7689A45EDD54A2DF28B1943E0E7DB</strong>
-												<weak>941210061</weak>
-												<size>8706</size>
-												<position>487</position>
-												<strong>0E9DF8366080712A816BE91ABCEF1E2044145B63D75B0B995B537900F378189E</strong>
-												<weak>1069696031</weak>
-												<size>255</size>
-												<position>8445</position>
+												<size>1</size>
+												<strong>373FAB70D1DAE4F1111AACCCCD3F6B55EAF8D1222E03A26A5A2F860B70D2D0C4</strong>
+												<weak>3697768091</weak>
+												<size>2013</size>
+												<position>91</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception_ptr.hpp</string>
+											<string>../../../../boost/throw_exception.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-15</id>
+										<id>-23</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>2</size>
-												<strong>86E1196533E771AEFD141DA43FCD980AE3D7689A45EDD54A2DF28B1943E0E7DB</strong>
-												<weak>941210061</weak>
-												<size>8706</size>
-												<position>487</position>
-												<strong>0066D4E6E6B189906E6DE04F08509F3737511701A1B1355B37511EC18E8371F4</strong>
-												<weak>2078296250</weak>
-												<size>305</size>
-												<position>8138</position>
+												<size>1</size>
+												<strong>4ED9709788BBAB4DE7CF336561606B8C0B41F70877A3395F4EE026F4AEB66CC6</strong>
+												<weak>743998427</weak>
+												<size>409</size>
+												<position>307</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception_ptr.hpp</string>
+											<string>../../example/cloning_1.cpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-14</id>
+										<id>-31</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8456,23 +8460,23 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>1</size>
-												<strong>A7B38E57D7A0B8823D9FE49F434B6B61D2C300ED96FA97BBAE9CED40660241DF</strong>
-												<weak>882254800</weak>
-												<size>9168</size>
-												<position>323</position>
+												<strong>F4C951B28F7DE500973AA3DFAA99F2BADA6EDAFA2B406C30BEF3B7FBE6FD57D7</strong>
+												<weak>2263754923</weak>
+												<size>982</size>
+												<position>306</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
+											<string>../../example/error_info_2.cpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-8</id>
+										<id>-17</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8480,27 +8484,27 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>2</size>
-												<strong>A7B38E57D7A0B8823D9FE49F434B6B61D2C300ED96FA97BBAE9CED40660241DF</strong>
-												<weak>882254800</weak>
-												<size>9168</size>
-												<position>323</position>
-												<strong>17E691632123EB67BA67D590B49EB8094F462F5A10A66A1C5438E1867EF1478E</strong>
-												<weak>765399792</weak>
-												<size>77</size>
-												<position>5917</position>
+												<strong>808CABE6CCA47C52CC9DD21911BF0B42284A5DD55AC3E665B29ED2B5F16AF7DA</strong>
+												<weak>3660693492</weak>
+												<size>8718</size>
+												<position>487</position>
+												<strong>E23085202D084CBB50F289988A6A592F06D923B77D0AB25D7A98A7188DF5BE3B</strong>
+												<weak>1414247481</weak>
+												<size>766</size>
+												<position>7382</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
+											<string>../../../../boost/exception_ptr.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-18</id>
+										<id>-7</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8508,27 +8512,27 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>2</size>
-												<strong>A7B38E57D7A0B8823D9FE49F434B6B61D2C300ED96FA97BBAE9CED40660241DF</strong>
-												<weak>882254800</weak>
-												<size>9168</size>
-												<position>323</position>
-												<strong>DF9EA87B0140AACF4422F1B76F6A6A409C15F32858BBBA85A35981A824C56BA9</strong>
-												<weak>1137981799</weak>
-												<size>192</size>
-												<position>8970</position>
+												<strong>808CABE6CCA47C52CC9DD21911BF0B42284A5DD55AC3E665B29ED2B5F16AF7DA</strong>
+												<weak>3660693492</weak>
+												<size>8718</size>
+												<position>487</position>
+												<strong>F86EB07D04CD0D0645080D1121DA899746D0C45137E17E1D9BE605E75396F047</strong>
+												<weak>1983537541</weak>
+												<size>1346</size>
+												<position>148</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
+											<string>../../../../boost/exception_ptr.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-13</id>
+										<id>-22</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8536,27 +8540,27 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>2</size>
-												<strong>A7B38E57D7A0B8823D9FE49F434B6B61D2C300ED96FA97BBAE9CED40660241DF</strong>
-												<weak>882254800</weak>
-												<size>9168</size>
-												<position>323</position>
-												<strong>B4D37C317A3B45825DDA1A8C8B1CE71CC2E530D15090D05995FCBEC4247F49C4</strong>
-												<weak>2742768198</weak>
-												<size>258</size>
-												<position>7305</position>
+												<strong>808CABE6CCA47C52CC9DD21911BF0B42284A5DD55AC3E665B29ED2B5F16AF7DA</strong>
+												<weak>3660693492</weak>
+												<size>8718</size>
+												<position>487</position>
+												<strong>DA033132CFA8F85C147C01F51FF7CF7399CF7D32D412F730EA3219CDAC608C72</strong>
+												<weak>3830952485</weak>
+												<size>712</size>
+												<position>1496</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
+											<string>../../../../boost/exception_ptr.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-26</id>
+										<id>-11</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8564,59 +8568,55 @@
                                                                                 <stream_hook_path>
                                                                                         <container>
                                                                                                 <size>2</size>
-												<strong>A7B38E57D7A0B8823D9FE49F434B6B61D2C300ED96FA97BBAE9CED40660241DF</strong>
-												<weak>882254800</weak>
-												<size>9168</size>
-												<position>323</position>
-												<strong>65D35B8A2063883A53E9D0DCC3FF8E5CA3573A58451A653CDE3003FFBEC576D3</strong>
-												<weak>1693870740</weak>
-												<size>2195</size>
-												<position>3720</position>
+												<strong>808CABE6CCA47C52CC9DD21911BF0B42284A5DD55AC3E665B29ED2B5F16AF7DA</strong>
+												<weak>3660693492</weak>
+												<size>8718</size>
+												<position>487</position>
+												<strong>0E9DF8366080712A816BE91ABCEF1E2044145B63D75B0B995B537900F378189E</strong>
+												<weak>1069696031</weak>
+												<size>255</size>
+												<position>8457</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
+											<string>../../../../boost/exception_ptr.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-41</id>
+										<id>-40</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
                                                                         <hook>
                                                                                 <stream_hook_path>
                                                                                         <container>
-												<size>3</size>
-												<strong>A7B38E57D7A0B8823D9FE49F434B6B61D2C300ED96FA97BBAE9CED40660241DF</strong>
-												<weak>882254800</weak>
-												<size>9168</size>
-												<position>323</position>
-												<strong>65D35B8A2063883A53E9D0DCC3FF8E5CA3573A58451A653CDE3003FFBEC576D3</strong>
-												<weak>1693870740</weak>
-												<size>2195</size>
-												<position>3720</position>
-												<strong>DA154372D8C23BD9EDC30005CA7959CE686D198891097A837D006B5222F04DE9</strong>
-												<weak>2768248809</weak>
-												<size>143</size>
-												<position>60</position>
+												<size>2</size>
+												<strong>808CABE6CCA47C52CC9DD21911BF0B42284A5DD55AC3E665B29ED2B5F16AF7DA</strong>
+												<weak>3660693492</weak>
+												<size>8718</size>
+												<position>487</position>
+												<strong>0066D4E6E6B189906E6DE04F08509F3737511701A1B1355B37511EC18E8371F4</strong>
+												<weak>2078296250</weak>
+												<size>305</size>
+												<position>8150</position>
                                                                                         </container>
                                                                                 </stream_hook_path>
                                                                         </hook>
                                                                         <file>
                                                                                 <path>
                                                                                         <empty>0</empty>
-											<string>../../../../boost/exception/exception.hpp</string>
+											<string>../../../../boost/exception_ptr.hpp</string>
                                                                                         <type>0</type>
                                                                                         <base>0</base>
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-29</id>
+										<id>-39</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8644,7 +8644,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-12</id>
+										<id>-21</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8672,7 +8672,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-6</id>
+										<id>-18</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8696,7 +8696,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-36</id>
+										<id>-25</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8720,7 +8720,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-32</id>
+										<id>-44</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                                 <pair>
@@ -8748,7 +8748,7 @@
                                                                                 </path>
                                                                         </file>
                                                                         <shared_ptr>
-										<id>-25</id>
+										<id>-5</id>
                                                                         </shared_ptr>
                                                                 </pair>
                                                         </sorted>
@@ -8776,7 +8776,7 @@
                                                                         <weak_ptr>
                                                                                 <expired>0</expired>
                                                                                 <shared_ptr>
-											<id>-6</id>
+											<id>-5</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
                                                                         <string>error_info free function</string>
@@ -8785,19 +8785,19 @@
                                                                         <weak_ptr>
                                                                                 <expired>0</expired>
                                                                                 <shared_ptr>
-											<id>-7</id>
+											<id>-6</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>exception_ptr type</string>
+									<string>function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
                                                                                 <expired>0</expired>
                                                                                 <shared_ptr>
-											<id>-8</id>
+											<id>-7</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string></string>
+									<string>exception_ptr free function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8806,7 +8806,7 @@
                                                                                         <id>-9</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string></string>
+									<string>type</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8824,7 +8824,7 @@
                                                                                         <id>-11</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string></string>
+									<string>exception_ptr type</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8833,7 +8833,7 @@
                                                                                         <id>-12</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string></string>
+									<string>function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8842,7 +8842,7 @@
                                                                                         <id>-13</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>exception_ptr free function</string>
+									<string>tutorial</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8851,7 +8851,7 @@
                                                                                         <id>-14</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>exception_ptr free function</string>
+									<string></string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8860,7 +8860,7 @@
                                                                                         <id>-15</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>exception_ptr free function</string>
+									<string>diagnostic_information free function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8869,7 +8869,7 @@
                                                                                         <id>-16</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>error_info</string>
+									<string>noalso noindex tutorial</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8887,7 +8887,7 @@
                                                                                         <id>-18</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>function</string>
+									<string>error_info free function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8905,7 +8905,7 @@
                                                                                         <id>-20</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>exception_ptr</string>
+									<string></string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8914,7 +8914,7 @@
                                                                                         <id>-21</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>error_info</string>
+									<string></string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8923,7 +8923,7 @@
                                                                                         <id>-22</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>exception_ptr free function</string>
+									<string>type</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8950,7 +8950,7 @@
                                                                                         <id>-25</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>error_info free function</string>
+									<string>noalso noindex tutorial</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8959,7 +8959,7 @@
                                                                                         <id>-26</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>error_info free function</string>
+									<string>tutorial</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8968,7 +8968,7 @@
                                                                                         <id>-27</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string></string>
+									<string>free function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8977,7 +8977,7 @@
                                                                                         <id>-28</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>noalso noindex tutorial</string>
+									<string>tutorial</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8986,7 +8986,7 @@
                                                                                         <id>-29</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>function</string>
+									<string>diagnostic_information tutorial</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -8995,7 +8995,7 @@
                                                                                         <id>-30</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>diagnostic_information free function</string>
+									<string>type</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -9004,7 +9004,7 @@
                                                                                         <id>-31</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>tutorial</string>
+									<string>noalso noindex tutorial</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -9013,7 +9013,7 @@
                                                                                         <id>-32</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>noalso noindex tutorial</string>
+									<string>index noindex</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -9022,7 +9022,7 @@
                                                                                         <id>-33</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>type</string>
+									<string>exception_ptr</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -9031,7 +9031,7 @@
                                                                                         <id>-34</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>error_info free function</string>
+									<string>error_info</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -9040,25 +9040,25 @@
                                                                                         <id>-35</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>type</string>
+									<string>noindex</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
                                                                                 <expired>0</expired>
                                                                                 <shared_ptr>
-											<id>-36</id>
+											<id>-39</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>noalso noindex tutorial</string>
+									<string>exception_ptr free function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
                                                                                 <expired>0</expired>
                                                                                 <shared_ptr>
-											<id>-37</id>
+											<id>-40</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>tutorial</string>
+									<string>exception_ptr free function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -9067,34 +9067,34 @@
                                                                                         <id>-38</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>free function</string>
+									<string>exception_ptr free function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
                                                                                 <expired>0</expired>
                                                                                 <shared_ptr>
-											<id>-39</id>
+											<id>-41</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>tutorial</string>
+									<string></string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
                                                                                 <expired>0</expired>
                                                                                 <shared_ptr>
-											<id>-40</id>
+											<id>-43</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>diagnostic_information tutorial</string>
+									<string>error_info</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
                                                                                 <expired>0</expired>
                                                                                 <shared_ptr>
-											<id>-41</id>
+											<id>-37</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>type</string>
+									<string>error_info free function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -9103,16 +9103,16 @@
                                                                                         <id>-42</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>noalso noindex tutorial</string>
+									<string></string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
                                                                                 <expired>0</expired>
                                                                                 <shared_ptr>
-											<id>-43</id>
+											<id>-36</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>noindex</string>
+									<string>error_info free function</string>
                                                                 </pair>
                                                                 <pair>
                                                                         <weak_ptr>
@@ -9121,7 +9121,7 @@
                                                                                         <id>-44</id>
                                                                                 </shared_ptr>
                                                                         </weak_ptr>
-									<string>index noindex</string>
+									<string>noalso noindex tutorial</string>
                                                                 </pair>
                                                         </sorted>
                                                 </tag_index>

Modified: branches/proto/v4/libs/exception/test/cloning_test.cpp
==============================================================================
--- branches/proto/v4/libs/exception/test/cloning_test.cpp	(original)
+++ branches/proto/v4/libs/exception/test/cloning_test.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -7,8 +7,13 @@
 #include <boost/exception/get_error_info.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/detail/workaround.hpp>
 #include <string>
 
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+struct my_tag {};
+#endif
+
 typedef boost::error_info<struct my_tag,int> my_info;
 
 template <class T>
@@ -36,8 +41,8 @@
     int & count;
 
     explicit
-    derives_nothing( int & count ):
-        count(count)
+    derives_nothing( int & c ):
+        count(c)
         {
         ++count;
         }

Modified: branches/proto/v4/libs/exception/test/errno_test.cpp
==============================================================================
--- branches/proto/v4/libs/exception/test/errno_test.cpp	(original)
+++ branches/proto/v4/libs/exception/test/errno_test.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -6,8 +6,13 @@
 #include <boost/exception/get_error_info.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/detail/workaround.hpp>
 #include <errno.h>
 
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+struct tag_errno {};
+#endif
+
 typedef boost::error_info<struct tag_errno,int> info_errno;
 
 class

Modified: branches/proto/v4/libs/exception/test/error_info_test.cpp
==============================================================================
--- branches/proto/v4/libs/exception/test/error_info_test.cpp	(original)
+++ branches/proto/v4/libs/exception/test/error_info_test.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -6,6 +6,7 @@
 #include <boost/exception/get_error_info.hpp>
 #include <boost/exception/info_tuple.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/detail/workaround.hpp>
 
 struct throws_on_copy;
 struct non_printable { };
@@ -34,6 +35,16 @@
         }
     };
 
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+struct tag_test_1 {};
+struct tag_test_2 {};
+struct tag_test_3 {};
+struct tag_test_4 {};
+struct tag_test_5 {};
+struct tag_test_6 {};
+struct tag_user_data {};
+#endif
+
 typedef boost::error_info<struct tag_test_1,int> test_1;
 typedef boost::error_info<struct tag_test_2,unsigned int> test_2;
 typedef boost::error_info<struct tag_test_3,float> test_3;

Modified: branches/proto/v4/libs/exception/test/unknown_exception_test.cpp
==============================================================================
--- branches/proto/v4/libs/exception/test/unknown_exception_test.cpp	(original)
+++ branches/proto/v4/libs/exception/test/unknown_exception_test.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -7,6 +7,11 @@
 #include <boost/exception/get_error_info.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/detail/workaround.hpp>
+
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+struct tag_test {};
+#endif
 
 typedef boost::error_info<struct tag_test,int> test;
 

Modified: branches/proto/v4/libs/filesystem/src/operations.cpp
==============================================================================
--- branches/proto/v4/libs/filesystem/src/operations.cpp	(original)
+++ branches/proto/v4/libs/filesystem/src/operations.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -112,9 +112,9 @@
 {
   const error_code ok;
 
-  const fs::directory_iterator end_itr;
   bool is_empty_directory( const std::string & dir_path )
   {
+    static const fs::directory_iterator end_itr;
     return fs::directory_iterator(fs::path(dir_path)) == end_itr;
   }
 
@@ -133,9 +133,9 @@
   inline DWORD get_file_attributes( const wchar_t * ph )
     { return ::GetFileAttributesW( ph ); }
 
-  const fs::wdirectory_iterator wend_itr;
   bool is_empty_directory( const std::wstring & dir_path )
   {
+    static const fs::wdirectory_iterator wend_itr;
     return fs::wdirectory_iterator(fs::wpath(dir_path)) == wend_itr;
   }
 

Modified: branches/proto/v4/libs/filesystem/test/Jamfile.v2
==============================================================================
--- branches/proto/v4/libs/filesystem/test/Jamfile.v2	(original)
+++ branches/proto/v4/libs/filesystem/test/Jamfile.v2	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -7,42 +7,33 @@
 project 
     : requirements
       <library>/boost/filesystem//boost_filesystem
-      <define>BOOST_ALL_NO_LIB
       <toolset>msvc:<asynch-exceptions>on
     ;
 
    test-suite "filesystem" :
        [ run path_test.cpp
-         :  :  : <define>BOOST_FILESYSTEM_STATIC_LINK 
-                 <link>static
+         :  :  : <link>static
        ]                  
        [ run path_test.cpp ../../system/build
-         :  :  : <define>BOOST_FILESYSTEM_DYN_LINK <define>BOOST_SYSTEM_DYN_LINK
-               : path_test_dll
+         :  :  :  : path_test_dll
        ]
        [ run operations_test.cpp
-         :  :  : <define>BOOST_FILESYSTEM_STATIC_LINK 
-                 <link>static
+         :  :  : <link>static
        ]
        [ run operations_test.cpp ../../system/build
-         :  :  : <define>BOOST_FILESYSTEM_DYN_LINK <define>BOOST_SYSTEM_DYN_LINK
-               : operations_test_dll
+         :  :  :  : operations_test_dll
        ]
        [ run fstream_test.cpp
-         :  :  : <define>BOOST_FILESYSTEM_STATIC_LINK 
-                 <link>static
+         :  :  : <link>static
        ]
        [ run convenience_test.cpp
-         :  :  : <define>BOOST_FILESYSTEM_STATIC_LINK
-                 <link>static                   
+         :  :  : <link>static                   
        ]
        [ run large_file_support_test.cpp
-         :  :  : <define>BOOST_FILESYSTEM_STATIC_LINK
-                 <link>static
+         :  :  : <link>static
        ]
        [ run wide_test.cpp
-          :  :  : <define>BOOST_FILESYSTEM_STATIC_LINK
-                  <link>static
+          :  :  : <link>static
        ]
 
        [ compile deprecated_test.cpp ]                  

Modified: branches/proto/v4/libs/graph/build/Jamfile.v2
==============================================================================
--- branches/proto/v4/libs/graph/build/Jamfile.v2	(original)
+++ branches/proto/v4/libs/graph/build/Jamfile.v2	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -23,23 +23,30 @@
     ECHO "Expat library directory: $(EXPAT_LIBPATH)" ;
   }
 
-  optional_sources += graphml.cpp ;
-  optional_reqs += <include>$(EXPAT_INCLUDE) 
-                   <library-path>$(EXPAT_LIBPATH) 
-                   <find-shared-library>expat
-                ;
+  alias graphml
+      : graphml.cpp
+      : # requirements
+      : # default built
+      : # usage requirements
+        <include>$(EXPAT_INCLUDE)
+        <library-path>$(EXPAT_LIBPATH)
+        <find-shared-library>expat
+      ;
 }
 else
 {
-  ECHO "warning: Graph library does not contain optional GraphML reader." ;
-  ECHO "note: to enable GraphML support, set EXPAT_INCLUDE and EXPAT_LIBPATH to the" ;
-  ECHO "note: directories containing the Expat headers and libraries, respectively." ;
+    message graphml
+      : "warning: Graph library does not contain optional GraphML reader."
+      : "note: to enable GraphML support, set EXPAT_INCLUDE and EXPAT_LIBPATH to the"
+      : "note: directories containing the Expat headers and libraries, respectively."
+      ;
 }
+explicit graphml ;
 
 lib boost_graph
     :
     read_graphviz_spirit.cpp
-    $(optional_sources)
+    graphml
     :
     <define>BOOST_GRAPH_NO_LIB=1
     <link>shared:<define>BOOST_GRAPH_DYN_LINK=1
@@ -48,8 +55,6 @@
     # Without these flags, MSVC 7.1 and 8.0 crash
     <toolset>msvc-7.1:<cxxflags>-GR-
     <toolset>msvc-8.0:<cxxflags>-GR-
-    # Requirements for any "optional" sources
-    $(optional_reqs)
     ;
 
 boost-install boost_graph ;
\ No newline at end of file

Modified: branches/proto/v4/libs/graph/test/Jamfile.v2
==============================================================================
--- branches/proto/v4/libs/graph/test/Jamfile.v2	(original)
+++ branches/proto/v4/libs/graph/test/Jamfile.v2	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -135,6 +135,8 @@
 
     [ run r_c_shortest_paths_test.cpp ]
 
+    [ run is_straight_line_draw_test.cpp ]
+
     $(optional_tests)
     ;
 

Modified: branches/proto/v4/libs/mpi/build/Jamfile.v2
==============================================================================
--- branches/proto/v4/libs/mpi/build/Jamfile.v2	(original)
+++ branches/proto/v4/libs/mpi/build/Jamfile.v2	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -102,12 +102,14 @@
       ;
   }
 }
-else
+else if ! ( --without-mpi in  [ modules.peek : ARGV ] )
 {
-  ECHO "warning: skipping optional Message Passing Interface (MPI) library." ;
-  ECHO "note: to enable MPI support, add \"using mpi ;\" to user-config.jam." ;
-  ECHO "note: to suppress this message, pass \"--without-mpi\" to bjam." ;
-  ECHO "note: otherwise, you can safely ignore this message." ;
+  message boost_mpi   
+      : "warning: skipping optional Message Passing Interface (MPI) library."
+      : "note: to enable MPI support, add \"using mpi ;\" to user-config.jam."
+      : "note: to suppress this message, pass \"--without-mpi\" to bjam."
+      : "note: otherwise, you can safely ignore this message." 
+      ;
 }
 
 boost-install $(libraries) ;
\ No newline at end of file

Modified: branches/proto/v4/libs/numeric/ublas/test/placement_new.cpp
==============================================================================
--- branches/proto/v4/libs/numeric/ublas/test/placement_new.cpp	(original)
+++ branches/proto/v4/libs/numeric/ublas/test/placement_new.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -12,6 +12,7 @@
 
 #include <boost/numeric/ublas/storage.hpp>
 #include <iostream>
+#include <new>
 
 // User defined type to capture base pointer on construction
 

Modified: branches/proto/v4/libs/pool/test/test_pool_alloc.cpp
==============================================================================
--- branches/proto/v4/libs/pool/test/test_pool_alloc.cpp	(original)
+++ branches/proto/v4/libs/pool/test/test_pool_alloc.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -304,11 +304,28 @@
     std::cout << "Memory error" << std::endl;
 }
 
+void test_void()
+{
+#ifdef VERBOSE
+    std::cout << "Testing void specialization. . ." << std::endl;
+#endif
+
+    typedef boost::pool_allocator<void> void_allocator;
+    typedef boost::fast_pool_allocator<void> fast_void_allocator;
+
+    typedef void_allocator::rebind<int>::other int_allocator;
+    typedef fast_void_allocator::rebind<int>::other fast_int_allocator;
+
+    std::vector<int, int_allocator> v1;
+    std::vector<int, fast_int_allocator> v2;
+}
+
 int test_main(int, char * [])
 {
   test();
   test_alloc();
   test_mem_usage();
+  test_void();
 
 #ifdef VERBOSE
   std::cout << "main() exiting. . ." << std::endl;

Modified: branches/proto/v4/libs/python/doc/building.html
==============================================================================
--- branches/proto/v4/libs/python/doc/building.html	(original)
+++ branches/proto/v4/libs/python/doc/building.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -9,7 +9,7 @@
 </head>
 <body>
 <div class="document" id="logo-boost-python-build-and-test-howto">
-<h1 class="title"><a class="reference external" href="../index.htm"><img alt="Boost C++ Libraries:" class="boost-logo" src="../../../boost.png" /></a> Boost.Python Build and Test HOWTO</h1>
+<h1 class="title"><a class="reference external" href="../index.html"><img alt="Boost C++ Libraries:" class="boost-logo" src="../../../boost.png" /></a> Boost.Python Build and Test HOWTO</h1>
 
 <!-- Copyright David Abrahams 2006. Distributed under the Boost -->
 <!-- Software License, Version 1.0. (See accompanying -->

Modified: branches/proto/v4/libs/python/doc/v2/CallPolicies.html
==============================================================================
--- branches/proto/v4/libs/python/doc/v2/CallPolicies.html	(original)
+++ branches/proto/v4/libs/python/doc/v2/CallPolicies.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -137,7 +137,7 @@
         <td valign="top"><code>P::extract_return_type</code></td>
 
         <td>A model of <a href=
-          "../../../doc/refmanual/metafunction.html">Metafunction</a>.</td>
+          "../../../mpl/doc/refmanual/metafunction.html">Metafunction</a>.</td>
 
         <td>An MPL unary <a href=
           "../../../mpl/doc/refmanual/metafunction.html">Metafunction</a> used extract the return type from a given signature. By default it is derived from mpl::front.</td>

Modified: branches/proto/v4/libs/regex/build/Jamfile.v2
==============================================================================
--- branches/proto/v4/libs/regex/build/Jamfile.v2	(original)
+++ branches/proto/v4/libs/regex/build/Jamfile.v2	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -33,8 +33,6 @@
       
          if [ GLOB $(dir)/include/unicode : utypes.h ]
          {
-            ECHO Building Boost.Regex with Unicode/ICU support enabled ;
-            ECHO Using ICU in $(ICU_PATH:J=" ")/include ;
             gHAS_ICU = true ;
             
             # try and find ICU libraries, look for NT versions first:
@@ -153,25 +151,42 @@
    
    if $(gHAS_ICU)
    {
+      message icu_config ;
+      message icu_config2 
+         : Note: Building Boost.Regex with Unicode/ICU support enabled
+         : "    Using ICU in " $(ICU_PATH:J=" ")/include ;
       return true ;
    }
    else
    {
-      ECHO Building Boost.Regex with the optional Unicode/ICU support disabled. ;
-      ECHO Please refer to the Boost.Regex documentation for more information ;
-      ECHO (don't panic: this is a strictly optional feature). ;
+      message icu_config
+		: "Building Boost.Regex with the optional Unicode/ICU support disabled."
+		: "Note: Please refer to the Boost.Regex documentation for more information"
+		: "Note: this is a strictly optional feature." ;
+
       if $(ICU_PATH)
       {
-         ECHO Couldn't find utypes.h in $(ICU_PATH:J=" ")/include/unicode ;
+         message icu_config2 
+           : WARNING! ICU configuration failed
+           : "    Couldn't find utypes.h in " $(ICU_PATH:J=" ")/include/unicode ;
+      }
+      else
+      {
+         message icu_config2 ;
       }
    }
 }
 
+explicit icu_config ;
+explicit icu_config2 ;
+
 if [ check-icu-config ]
 {
+if $(gHAS_ICU)
+{
    BOOST_REGEX_ICU_OPTS = "<target-os>freebsd:<include>/usr/local/include" ;
    BOOST_REGEX_ICU_OPTS += "<define>BOOST_HAS_ICU=1" ;
-
+   
    if $(ICU_PATH)
    {
       if $(ICU_PATH) != "/usr" && $(ICU_PATH) != "/usr/local"
@@ -212,6 +227,7 @@
       }
 #End of addition by Tommy Nordgren
    }
+   }
 }
 
 SOURCES = 
@@ -234,7 +250,7 @@
    usinstances.cpp ;
 
 
-lib boost_regex : ../src/$(SOURCES) $(ICU_EXTRA_SOURCE)
+lib boost_regex : ../src/$(SOURCES) $(ICU_EXTRA_SOURCE) icu_config2 icu_config
     :         
         #<link>static:<define>BOOST_REGEX_NO_LIB=1
         #<link>static:<define>BOOST_REGEX_STATIC_LINK=1
@@ -261,3 +277,5 @@
 
 
 
+
+

Modified: branches/proto/v4/libs/serialization/build/Jamfile.v2
==============================================================================
--- branches/proto/v4/libs/serialization/build/Jamfile.v2	(original)
+++ branches/proto/v4/libs/serialization/build/Jamfile.v2	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -8,7 +8,7 @@
 
 project boost/serialization
     : source-location ../src
-    : requirements <dependency>../../config/test/all//BOOST_NO_STD_LOCALE
+    : requirements
       <conditional>@include-spirit
 ;
 
@@ -100,7 +100,6 @@
     : $(WSOURCES).cpp boost_serialization 
     :     
     <toolset>msvc:<cxxflags>/Gy 
-    <dependency>../../config/test/all//BOOST_NO_STD_WSTREAMBUF
     <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
     ;
 

Modified: branches/proto/v4/libs/serialization/src/extended_type_info.cpp
==============================================================================
--- branches/proto/v4/libs/serialization/src/extended_type_info.cpp	(original)
+++ branches/proto/v4/libs/serialization/src/extended_type_info.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -85,19 +85,20 @@
 BOOST_SERIALIZATION_DECL(void)  
 extended_type_info::key_unregister() {
     assert(NULL != m_key);
-    detail::ktmap & x = singleton<detail::ktmap>::get_mutable_instance();
-    detail::ktmap::iterator start = x.lower_bound(this);
-    detail::ktmap::iterator end = x.upper_bound(this);
-    assert(start != end);
-
-    // remove entry in map which corresponds to this type
-    do{
-        if(this == *start)
-            x.erase(start++);
-        else
-		++start;
-    }while(start != end);
-
+    if(! singleton<detail::ktmap>::is_destroyed()){
+        detail::ktmap & x = singleton<detail::ktmap>::get_mutable_instance();
+        detail::ktmap::iterator start = x.lower_bound(this);
+        detail::ktmap::iterator end = x.upper_bound(this);
+        assert(start != end);
+
+        // remove entry in map which corresponds to this type
+        do{
+            if(this == *start)
+                x.erase(start++);
+            else
+		    ++start;
+        }while(start != end);
+    }
     m_key = NULL;
 }
 

Modified: branches/proto/v4/libs/serialization/src/extended_type_info_typeid.cpp
==============================================================================
--- branches/proto/v4/libs/serialization/src/extended_type_info_typeid.cpp	(original)
+++ branches/proto/v4/libs/serialization/src/extended_type_info_typeid.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -48,16 +48,19 @@
 extended_type_info_typeid_0::is_less_than(
     const boost::serialization::extended_type_info & rhs
 ) const {
-    return m_ti->before(
+    return static_cast<bool>(m_ti->before(
         *(static_cast<const extended_type_info_typeid_0 &>(rhs).m_ti)
-    );
+    ));
 }
 
 BOOST_SERIALIZATION_DECL(bool) 
 extended_type_info_typeid_0::is_equal(
     const boost::serialization::extended_type_info & rhs
 ) const {
-    return * m_ti == *(static_cast<const extended_type_info_typeid_0 &>(rhs).m_ti);
+    return static_cast<bool>(
+        * m_ti 
+        == *(static_cast<const extended_type_info_typeid_0 &>(rhs).m_ti)
+    );
 }
 
 BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())
@@ -79,22 +82,22 @@
 BOOST_SERIALIZATION_DECL(void) 
 extended_type_info_typeid_0::type_unregister()
 {
-    if(NULL == m_ti)
-        return;
-    
-        tkmap & x = singleton<tkmap>::get_mutable_instance();
-        tkmap::iterator start = x.lower_bound(this);
-        tkmap::iterator end = x.upper_bound(this);
-        assert(start != end);
-
-        // remove entry in map which corresponds to this type
-        do{
-          if(this == *start)
+    if(NULL == m_ti){
+        if(! singleton<tkmap>::is_destroyed()){
+            tkmap & x = singleton<tkmap>::get_mutable_instance();
+            tkmap::iterator start = x.lower_bound(this);
+            tkmap::iterator end = x.upper_bound(this);
+            assert(start != end);
+
+            // remove entry in map which corresponds to this type
+            do{
+            if(this == *start)
                     x.erase(start++);
-     	else
+     	    else
                 ++start;
-        }while(start != end);
-
+            }while(start != end);
+        }
+    }
     m_ti = NULL;
 }
 

Modified: branches/proto/v4/libs/serialization/src/void_cast.cpp
==============================================================================
--- branches/proto/v4/libs/serialization/src/void_cast.cpp	(original)
+++ branches/proto/v4/libs/serialization/src/void_cast.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -34,28 +34,7 @@
 namespace serialization {
 namespace void_cast_detail {
 
-#if 0
-// registry of casting objects
-struct void_caster_compare
-{
-    bool
-    operator()(
-        const void_caster * lhs, 
-        const void_caster * rhs 
-    ) const {
-        if( lhs->m_derived < rhs->m_derived )
-            return true;
-        if( lhs->m_base < rhs->m_base )
-            return true;
-        return false;
-    }
-};
-
-typedef std::set<const void_caster *, void_caster_compare> set_type;
-#endif
-
 typedef std::vector<const void_caster *> set_type;
-
 typedef boost::serialization::singleton<set_type> void_caster_registry;
 
 inline bool
@@ -93,21 +72,23 @@
 
 BOOST_SERIALIZATION_DECL(void)
 void_caster::static_unregister() const {
-    void_cast_detail::set_type & st 
-        = void_caster_registry::get_mutable_instance();
-    void_cast_detail::set_type::iterator it;
-    it = std::find(st.begin(), st.end(), this);
-    assert(st.end() != it);
-    st.erase(it);
-    // to do - remove all void_caster_derived entries
-    // which depend upon this primitive
-    /*
-    while(){
-        if(!truncate_down(this)
-        && !truncate_up(this))
-            break;
+    if(! void_caster_registry::is_destroyed()){
+        void_cast_detail::set_type & st 
+            = void_caster_registry::get_mutable_instance();
+        void_cast_detail::set_type::iterator it;
+        it = std::find(st.begin(), st.end(), this);
+        assert(st.end() != it);
+        st.erase(it);
+        // to do - remove all void_caster_derived entries
+        // which depend upon this primitive
+        /*
+        while(){
+            if(!truncate_down(this)
+            && !truncate_up(this))
+                break;
+        }
+        */
     }
-    */
 }
 
 #if 0

Modified: branches/proto/v4/libs/serialization/vc7ide/BoostSerializationLibrary.sln
==============================================================================
--- branches/proto/v4/libs/serialization/vc7ide/BoostSerializationLibrary.sln	(original)
+++ branches/proto/v4/libs/serialization/vc7ide/BoostSerializationLibrary.sln	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -315,6 +315,10 @@
         ProjectSection(ProjectDependencies) = postProject
         EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_zmisc", "test_zmisc.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
         GlobalSection(SolutionConfiguration) = preSolution
                 Debug = Debug
@@ -378,8 +382,8 @@
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
@@ -5682,8 +5686,8 @@
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
-		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static|Win32
+		{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
                 {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
@@ -6442,84 +6446,162 @@
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
                 {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-dynamic threading-multi|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic threading-multi|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic text_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic text_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic text_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic text_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic xml_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic xml_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic xml_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic xml_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static text_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static text_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static text_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static text_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi text_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi text_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi text_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi text_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi xml_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi xml_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi xml_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi xml_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static xml_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static xml_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static xml_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static xml_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic text_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic text_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic text_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic text_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic xml_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic xml_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic xml_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic xml_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static text_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static text_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static text_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static text_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi binary_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi text_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi text_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi text_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi text_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi xml_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi xml_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi xml_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi xml_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static xml_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static xml_archive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static xml_warchive|Win32
-		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static xml_warchive|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static|Win32
+		{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static|Win32
         EndGlobalSection
         GlobalSection(ExtensibilityGlobals) = postSolution
         EndGlobalSection

Modified: branches/proto/v4/libs/serialization/vc7ide/Library.vcproj
==============================================================================
--- branches/proto/v4/libs/serialization/vc7ide/Library.vcproj	(original)
+++ branches/proto/v4/libs/serialization/vc7ide/Library.vcproj	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -147,7 +147,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libboost_serialization-vc71-sgd-1_34_1.lib"/>
+				OutputFile="$(OutDir)/libboost_serialization-vc71-sgd-1_37.lib"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -183,7 +183,7 @@
                                 MinimalRebuild="FALSE"
                                 BasicRuntimeChecks="0"
                                 SmallerTypeCheck="FALSE"
-				RuntimeLibrary="1"
+				RuntimeLibrary="5"
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
                                 TreatWChar_tAsBuiltInType="TRUE"
@@ -198,7 +198,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/libboost_serialization-vc71-mt-sgd-1_34_1.lib"/>
+				OutputFile="$(OutDir)/libboost_serialization-vc71-sgd-1_3y.lib"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool
@@ -507,6 +507,9 @@
                         <File
                                 RelativePath="..\..\..\boost\serialization\weak_ptr.hpp">
                         </File>
+			<File
+				RelativePath="..\..\..\boost\serialization\wrapper.hpp">
+			</File>
                         <Filter
                                 Name="detail"
                                 Filter="">

Modified: branches/proto/v4/libs/spirit/doc/lex/lexer_quickstart3.qbk
==============================================================================
--- branches/proto/v4/libs/spirit/doc/lex/lexer_quickstart3.qbk	(original)
+++ branches/proto/v4/libs/spirit/doc/lex/lexer_quickstart3.qbk	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -20,7 +20,7 @@
 library. The [link spirit.lex.flowcontrol picture] below shows the common 
 flow control implemented while parsing combined with lexical analysis.
 
-[fig ./images/FlowOfControl.png..The common flow control implemented while parsing combined with lexical analysis..spirit.lex.flowcontrol]
+[fig ./images/flowofcontrol.png..The common flow control implemented while parsing combined with lexical analysis..spirit.lex.flowcontrol]
 
 Another problem related to the integration of the lexical analyzer with the 
 parser was to find a way how the defined tokens syntactically could be blended

Modified: branches/proto/v4/libs/spirit/doc/lex/tokens_values.qbk
==============================================================================
--- branches/proto/v4/libs/spirit/doc/lex/tokens_values.qbk	(original)
+++ branches/proto/v4/libs/spirit/doc/lex/tokens_values.qbk	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -56,7 +56,7 @@
 was matched in. The following [link spirit.lex.tokenstructure figure] shows the 
 schematic structure of a token.
 
-[fig ./images/TokenStructure.png..The structure of a token..spirit.lex.tokenstructure]
+[fig ./images/tokenstructure.png..The structure of a token..spirit.lex.tokenstructure]
 
 The token value and the token state may be omitted for optimization reasons, 
 avoiding the token to carry more data than actually required. This 

Modified: branches/proto/v4/libs/spirit/phoenix/test/algorithm/iteration.cpp
==============================================================================
--- branches/proto/v4/libs/spirit/phoenix/test/algorithm/iteration.cpp	(original)
+++ branches/proto/v4/libs/spirit/phoenix/test/algorithm/iteration.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#include <boost/spirit/include/phoenix_stl.hpp/iteration.hpp>
+#include <boost/spirit/home/phoenix/stl/algorithm/iteration.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/detail/lightweight_test.hpp>
 

Modified: branches/proto/v4/libs/spirit/phoenix/test/algorithm/querying.cpp
==============================================================================
--- branches/proto/v4/libs/spirit/phoenix/test/algorithm/querying.cpp	(original)
+++ branches/proto/v4/libs/spirit/phoenix/test/algorithm/querying.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#include <boost/spirit/include/phoenix_stl.hpp/querying.hpp>
+#include <boost/spirit/home/phoenix/stl/algorithm/querying.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/detail/lightweight_test.hpp>
 

Modified: branches/proto/v4/libs/spirit/phoenix/test/algorithm/querying2.cpp
==============================================================================
--- branches/proto/v4/libs/spirit/phoenix/test/algorithm/querying2.cpp	(original)
+++ branches/proto/v4/libs/spirit/phoenix/test/algorithm/querying2.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#include <boost/spirit/include/phoenix_stl.hpp/querying.hpp>
+#include <boost/spirit/home/phoenix/stl/algorithm/querying.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/detail/lightweight_test.hpp>
 

Modified: branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation1.cpp
==============================================================================
--- branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation1.cpp	(original)
+++ branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation1.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#include <boost/spirit/include/phoenix_stl.hpp/transformation.hpp>
+#include <boost/spirit/home/phoenix/stl/algorithm/transformation.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/detail/lightweight_test.hpp>
 

Modified: branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation2.cpp
==============================================================================
--- branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation2.cpp	(original)
+++ branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation2.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#include <boost/spirit/include/phoenix_stl.hpp/transformation.hpp>
+#include <boost/spirit/home/phoenix/stl/algorithm/transformation.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/detail/lightweight_test.hpp>
 

Modified: branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation3.cpp
==============================================================================
--- branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation3.cpp	(original)
+++ branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation3.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#include <boost/spirit/phoenix/stl/algorithm/transformation.hpp>
+#include <boost/spirit/home/phoenix/stl/algorithm/transformation.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/detail/lightweight_test.hpp>
 

Modified: branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation4.cpp
==============================================================================
--- branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation4.cpp	(original)
+++ branches/proto/v4/libs/spirit/phoenix/test/algorithm/transformation4.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#include <boost/spirit/phoenix/stl/algorithm/transformation.hpp>
+#include <boost/spirit/home/phoenix/stl/algorithm/transformation.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/detail/lightweight_test.hpp>
 

Modified: branches/proto/v4/libs/spirit/phoenix/test/bind/bind_function_object_tests.cpp
==============================================================================
--- branches/proto/v4/libs/spirit/phoenix/test/bind/bind_function_object_tests.cpp	(original)
+++ branches/proto/v4/libs/spirit/phoenix/test/bind/bind_function_object_tests.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -101,6 +101,12 @@
     int const ic5 = 5;
     // testing consts
     BOOST_TEST(bind(sqr(), arg1)(ic5) == (ic5*ic5));
+    
+    // From Steven Watanabe
+    sqr s;
+    int x = 2;
+    int result = bind(ref(s), _1)(x); 
+    BOOST_TEST(result == 4);
 
     return boost::report_errors();
 }

Modified: branches/proto/v4/libs/spirit/phoenix/test/container/container_tests.hpp
==============================================================================
--- branches/proto/v4/libs/spirit/phoenix/test/container/container_tests.hpp	(original)
+++ branches/proto/v4/libs/spirit/phoenix/test/container/container_tests.hpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -9,7 +9,7 @@
 
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/phoenix/stl/container/container.hpp>
+#include <boost/spirit/home/phoenix/stl/container/container.hpp>
 
 #include <iostream>
 #include <typeinfo>

Modified: branches/proto/v4/libs/spirit/phoenix/test/operator/member.cpp
==============================================================================
--- branches/proto/v4/libs/spirit/phoenix/test/operator/member.cpp	(original)
+++ branches/proto/v4/libs/spirit/phoenix/test/operator/member.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -23,6 +23,7 @@
 
         int func(int n) const { return n; }
         int dunc() { return 10; }
+        int kunc() const { return 555; }
     };
 }
 
@@ -44,10 +45,13 @@
     BOOST_TEST(test.value == 2);
 
     BOOST_TEST((val(ptr)->*&Test::func)(3)() == 3);
+    int i = 33;
+    BOOST_TEST((arg1->*&Test::func)(arg2)(cptr, i) == i);
     BOOST_TEST((val(cptr)->*&Test::func)(4)() == 4);
     BOOST_TEST((val(ptr)->*&Test::dunc)()() == 10);
 
     BOOST_TEST((arg1->*&Test::func)(5)(ptr) == 5);
+    BOOST_TEST((arg1->*&Test::kunc)()(ptr));
 
     shared_ptr<Test> sptr(new Test(test));
 

Modified: branches/proto/v4/libs/spirit/phoenix/test/scope/bug_000008.cpp
==============================================================================
--- branches/proto/v4/libs/spirit/phoenix/test/scope/bug_000008.cpp	(original)
+++ branches/proto/v4/libs/spirit/phoenix/test/scope/bug_000008.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -15,6 +15,7 @@
 #include <boost/config.hpp>
 #include <boost/assert.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/spirit/home/phoenix/scope/dynamic.hpp>
 
 #if defined(DONT_HAVE_BOOST)                        \
     || !defined(BOOST_HAS_THREADS)                  \

Modified: branches/proto/v4/libs/spirit/phoenix/test/scope/dynamic_tests.cpp
==============================================================================
--- branches/proto/v4/libs/spirit/phoenix/test/scope/dynamic_tests.cpp	(original)
+++ branches/proto/v4/libs/spirit/phoenix/test/scope/dynamic_tests.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -12,7 +12,7 @@
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_scope.hpp>
+#include <boost/spirit/home/phoenix/scope/dynamic.hpp>
 
 struct my_dynamic : ::boost::phoenix::dynamic<int, std::string, double>
 {

Modified: branches/proto/v4/libs/system/src/error_code.cpp
==============================================================================
--- branches/proto/v4/libs/system/src/error_code.cpp	(original)
+++ branches/proto/v4/libs/system/src/error_code.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -61,11 +61,12 @@
 
   const char * generic_error_category::name() const
   {
-    return "GENERIC";
+    return "generic";
   }
 
   std::string generic_error_category::message( int ev ) const
   {
+    static std::string unknown_err( "Unknown error" );
   // strerror_r is preferred because it is always thread safe,
   // however, we fallback to strerror in certain cases because:
   //   -- Windows doesn't provide strerror_r.
@@ -81,15 +82,19 @@
      || (defined(__osf__) && !defined(_REENTRANT))\
      || (defined(__vms))
       const char * c_str = std::strerror( ev );
-      return std::string( c_str ? c_str : "Unknown error" );
-  # else
+      return  c_str
+        ? std::string( c_str )
+        : unknown_err;
+  # else  // use strerror_r
       char buf[64];
       char * bp = buf;
       std::size_t sz = sizeof(buf);
   #  if defined(__CYGWIN__) || defined(__USE_GNU)
       // Oddball version of strerror_r
       const char * c_str = strerror_r( ev, bp, sz );
-      return std::string( c_str ? c_str : "Unknown error" );
+      return  c_str
+        ? std::string( c_str )
+        : unknown_err;
   #  else
       // POSIX version of strerror_r
       int result;
@@ -100,7 +105,9 @@
   #  if defined (__sgi)
         const char * c_str = strerror( ev );
         result = 0;
-        return std::string( c_str ? c_str : "Unknown error" );
+      return  c_str
+        ? std::string( c_str )
+        : unknown_err;
   #  else
         result = strerror_r( ev, bp, sz );
   #  endif
@@ -113,26 +120,31 @@
           result = errno;
   #  endif
           if ( result !=  ERANGE ) break;
-        if ( sz > sizeof(buf) ) std::free( bp );
-        sz *= 2;
-        if ( (bp = static_cast<char*>(std::malloc( sz ))) == 0 )
-          return std::string( "ENOMEM" );
+          if ( sz > sizeof(buf) ) std::free( bp );
+          sz *= 2;
+          if ( (bp = static_cast<char*>(std::malloc( sz ))) == 0 )
+            return std::string( "ENOMEM" );
         }
       }
+      std::string msg();
       try
       {
-      std::string msg( ( result == invalid_argument ) ? "Unknown error" : bp );
-      if ( sz > sizeof(buf) ) std::free( bp );
-        sz = 0;
-      return msg;
+        msg = ( ( result == invalid_argument ) ? "Unknown error" : bp );
       }
+
+#   ifndef BOOST_NO_EXCEPTIONS
+      // See ticket #2098
       catch(...)
       {
-        if ( sz > sizeof(buf) ) std::free( bp );
-        throw;
+        // just eat the exception
       }
-  #  endif
-  # endif
+#   endif
+
+      if ( sz > sizeof(buf) ) std::free( bp );
+      sz = 0;
+      return msg;
+  #  endif   // else POSIX version of strerror_r
+  # endif  // else use strerror_r
   }
   //  system_error_category implementation  --------------------------------// 
 

Modified: branches/proto/v4/libs/system/test/Jamfile.v2
==============================================================================
--- branches/proto/v4/libs/system/test/Jamfile.v2	(original)
+++ branches/proto/v4/libs/system/test/Jamfile.v2	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -10,7 +10,6 @@
 project
     : requirements
       <library>/boost/system//boost_system
-      <define>BOOST_ALL_NO_LIB
       <toolset>msvc:<asynch-exceptions>on
     ;
 

Modified: branches/proto/v4/libs/test/doc/html/utf/user-guide/fixture/global.html
==============================================================================
--- branches/proto/v4/libs/test/doc/html/utf/user-guide/fixture/global.html	(original)
+++ branches/proto/v4/libs/test/doc/html/utf/user-guide/fixture/global.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -39,7 +39,7 @@
 <li>There is no place for cleanup/teardown operations in the initialization function.</li>
 <li>
      Unlike the initialization function, the global fixture setup method invocation is guarded by the execution
-     monitor. That means that all uncaught errors that occur during initialization are properly.
+     monitor. That means that all uncaught errors that occur during initialization are properly reported.
     </li>
 <li>
      Any number of different global fixtures can be defined, which allows you to split initialization code by

Modified: branches/proto/v4/libs/thread/test/test_thread_move.cpp
==============================================================================
--- branches/proto/v4/libs/thread/test/test_thread_move.cpp	(original)
+++ branches/proto/v4/libs/thread/test/test_thread_move.cpp	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -5,26 +5,59 @@
 #include <boost/thread/thread.hpp>
 #include <boost/test/unit_test.hpp>
 
-void do_nothing()
-{}
+void do_nothing(boost::thread::id* my_id)
+{
+    *my_id=boost::this_thread::get_id();
+}
 
 void test_move_on_construction()
 {
-    boost::thread x=boost::thread(do_nothing);
+    boost::thread::id the_id;
+    boost::thread x=boost::thread(do_nothing,&the_id);
+    boost::thread::id x_id=x.get_id();
     x.join();
+    BOOST_CHECK_EQUAL(the_id,x_id);
 }
 
-boost::thread make_thread()
+boost::thread make_thread(boost::thread::id* the_id)
 {
-    return boost::thread(do_nothing);
+    return boost::thread(do_nothing,the_id);
 }
 
 void test_move_from_function_return()
 {
-    boost::thread x=make_thread();
+    boost::thread::id the_id;
+    boost::thread x=make_thread(&the_id);
+    boost::thread::id x_id=x.get_id();
     x.join();
+    BOOST_CHECK_EQUAL(the_id,x_id);
+}
+
+boost::thread make_thread_return_lvalue(boost::thread::id* the_id)
+{
+    boost::thread t(do_nothing,the_id);
+    return boost::move(t);
 }
 
+void test_move_from_function_return_lvalue()
+{
+    boost::thread::id the_id;
+    boost::thread x=make_thread_return_lvalue(&the_id);
+    boost::thread::id x_id=x.get_id();
+    x.join();
+    BOOST_CHECK_EQUAL(the_id,x_id);
+}
+
+void test_move_assign()
+{
+    boost::thread::id the_id;
+    boost::thread x(do_nothing,&the_id);
+    boost::thread y;
+    y=boost::move(x);
+    boost::thread::id y_id=y.get_id();
+    y.join();
+    BOOST_CHECK_EQUAL(the_id,y_id);
+}
 
 boost::unit_test_framework::test_suite* init_unit_test_suite(int, char*[])
 {
@@ -33,5 +66,7 @@
 
     test->add(BOOST_TEST_CASE(test_move_on_construction));
     test->add(BOOST_TEST_CASE(test_move_from_function_return));
+    test->add(BOOST_TEST_CASE(test_move_from_function_return_lvalue));
+    test->add(BOOST_TEST_CASE(test_move_assign));
     return test;
 }

Modified: branches/proto/v4/libs/type_traits/doc/credits.qbk
==============================================================================
--- branches/proto/v4/libs/type_traits/doc/credits.qbk	(original)
+++ branches/proto/v4/libs/type_traits/doc/credits.qbk	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -8,7 +8,7 @@
 [section:credits Credits]
 
 This documentation was pulled together by John Maddock, using 
-[@../../../../tools/quickbook/doc/html/index.html Boost.Quickbook]
+[@../../../../doc/html/quickbook.html Boost.Quickbook]
 and [@../../../../doc/html/boostbook.html Boost.DocBook].
  
 The original version of this library was created by Steve Cleary, 

Modified: branches/proto/v4/libs/utility/operators.htm
==============================================================================
--- branches/proto/v4/libs/utility/operators.htm	(original)
+++ branches/proto/v4/libs/utility/operators.htm	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -2030,7 +2030,7 @@
 </pre>
     </blockquote>
 
-    <p>Check the <a href="../../status/compiler_status.html">compiler status
+    <p>Check the <a href="http://www.boost.org/development/testing.html">compiler status
     report</a> for the test results with selected platforms.</p>
     <hr>
 

Modified: branches/proto/v4/status/explicit-failures-markup.xml
==============================================================================
--- branches/proto/v4/status/explicit-failures-markup.xml	(original)
+++ branches/proto/v4/status/explicit-failures-markup.xml	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -5067,6 +5067,8 @@
             <test name="std_test_function_tricky"/>
             <test name="std_test_reference_wrapper_tricky"/>
             <test name="test_reference_wrapper_tricky"/>
+            <test name="std_test_cmath_tricky"/>
+            <test name="test_cmath_tricky"/>
             <toolset name="*"/>
             <note author="John Maddock">
                 These tests test features that are not supported in the
@@ -5115,7 +5117,18 @@
             </note>
         </mark-expected-failures>
 
-        <mark-expected-failures>
+       <mark-expected-failures>
+          <test name="test_cmath"/>
+          <test name="std_test_cmath"/>
+          <toolset name="intel-linux-9.0"/>
+          <toolset name="darwin-4.0.1"/>
+          <note author="John Maddock">
+             These tests fail due to a lack of adequate
+             long double std math lib support.
+          </note>
+       </mark-expected-failures>
+
+       <mark-expected-failures>
             <test name="test_regex"/>
             <test name="std_test_regex"/>
             <toolset name="gcc-mingw*"/>

Modified: branches/proto/v4/tools/boostbook/xsl/annotation.xsl
==============================================================================
--- branches/proto/v4/tools/boostbook/xsl/annotation.xsl	(original)
+++ branches/proto/v4/tools/boostbook/xsl/annotation.xsl	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -20,27 +20,9 @@
   <xsl:key name="named-entities" match="class|struct|union|concept|function|overloaded-function|macro|library|namespace/data-member|header/data-member|*[attribute::id]" use="@name|@id"/>
 
   <xsl:template match="function|overloaded-function" mode="generate.id">
-    <xsl:variable name="name" select="normalize-space(@name)"/>
-    <xsl:variable name="translated-name"
-                  select="translate($name,
-                                    '~!%^&amp;*()[].,&lt;&gt;|/ +-=',
-                                    'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX')"/>
-
-    <xsl:choose>
-      <xsl:when test="count(key('named-entities', $name))=1
-                      and ($translated-name=$name)">
-        <xsl:call-template name="fully-qualified-id">
-          <xsl:with-param name="node" select="."/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="fully-qualified-id">
-          <xsl:with-param name="node" select="."/>
-        </xsl:call-template>
-        <xsl:text>_</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:call-template name="fully-qualified-id">
+      <xsl:with-param name="node" select="."/>
+    </xsl:call-template>
   </xsl:template>
 
   <xsl:template match="classname" mode="annotation">

Modified: branches/proto/v4/tools/boostbook/xsl/chunk-common.xsl
==============================================================================
--- branches/proto/v4/tools/boostbook/xsl/chunk-common.xsl	(original)
+++ branches/proto/v4/tools/boostbook/xsl/chunk-common.xsl	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -28,7 +28,7 @@
     <xsl:choose>
         <xsl:when test="not($recursive)">
             <!-- translate dots into directory separators, and replace illegal file path characters with underscores -->
-            <xsl:value-of select="translate(normalize-space(translate($basename, '.&lt;&gt;\:*?&quot;|,()!+=&amp;', '/               ' )), ' ', '_')"/>
+            <xsl:value-of select="translate($basename, '.&lt;&gt;\:*?&quot;|,()!+=&amp;', '/_______________' )"/>
             <xsl:value-of select="$html.ext"/>
         </xsl:when>
         <xsl:otherwise>

Modified: branches/proto/v4/tools/boostbook/xsl/docbook.xsl
==============================================================================
--- branches/proto/v4/tools/boostbook/xsl/docbook.xsl	(original)
+++ branches/proto/v4/tools/boostbook/xsl/docbook.xsl	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -152,7 +152,7 @@
 
   <xsl:template match="header" mode="generate.id">
     <xsl:text>header.</xsl:text>
-    <xsl:value-of select="translate(@name, '/','.')"/>
+    <xsl:value-of select="translate(@name, '/.', '._')"/>
   </xsl:template>
 
   <xsl:template match="*" mode="passthrough">

Modified: branches/proto/v4/tools/boostbook/xsl/lookup.xsl
==============================================================================
--- branches/proto/v4/tools/boostbook/xsl/lookup.xsl	(original)
+++ branches/proto/v4/tools/boostbook/xsl/lookup.xsl	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -9,7 +9,10 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
-  <xsl:param name="boost.max.id.length">26</xsl:param>
+  <!-- Maximum length of directory and file names is 31 characters.
+       '.html' uses 5 characters.
+       31 - 5 = 26 -->
+  <xsl:param name="boost.max.id.part.length">26</xsl:param>
 
   <!-- Generate an ID for the entity referenced -->
   <xsl:template name="generate.id">
@@ -125,42 +128,31 @@
   <!-- Build the fully-qualified id of the given node -->
   <xsl:template name="fully-qualified-id">
     <xsl:param name="node"/>
-    <xsl:variable name="name">
-      <xsl:apply-templates select="$node" mode="fully-qualified-name">
-        <xsl:with-param name="separator" select="'@'"/>
-      </xsl:apply-templates>
-    </xsl:variable>
-    <xsl:value-of select="translate(normalize-space(translate($name, '.', ' ')), ' @', '_.')"/>
-    <xsl:if test="$node/ancestor-or-self::class-specialization|
-      $node/ancestor-or-self::struct-specialization|
-      $node/ancestor-or-self::union-specialization">
-      <xsl:text>_</xsl:text>
-      <xsl:value-of select="generate-id($node)"/>
-    </xsl:if>
+
+    <xsl:apply-templates select="$node" mode="fully-qualified-name">
+      <xsl:with-param name="is.id" select="true()"/>
+    </xsl:apply-templates>
   </xsl:template>
 
   <!-- Build the fully-qualified name of the given node -->
   <xsl:template name="fully-qualified-name">
     <xsl:param name="node"/>
-    <xsl:param name="separator" select="'::'"/>
-    <xsl:apply-templates select="$node" mode="fully-qualified-name">
-      <xsl:with-param name="separator" select="$separator"/>
-    </xsl:apply-templates>
+    <xsl:apply-templates select="$node" mode="fully-qualified-name"/>
   </xsl:template>
 
   <!-- Hack to make the node we are building the current node so that the
        ancestor:: syntax will work -->
   <xsl:template match="*" mode="fully-qualified-name">
-    <xsl:param name="separator" select="'::'"/>
+    <xsl:param name="is.id" select="false()" />
     <xsl:call-template name="build-fully-qualified-name">
-      <xsl:with-param name="separator" select="$separator"/>
+      <xsl:with-param name="is.id" select="$is.id"/>
     </xsl:call-template>
   </xsl:template>
 
   <!-- The real routine that builds a fully-qualified name for the current
        node. -->
   <xsl:template name="build-fully-qualified-name">
-    <xsl:param name="separator" select="'::'"/>
+    <xsl:param name="is.id" select="false()" />
 
     <!-- The depth of qualified name element that we will print now-->
     <xsl:param name="depth" select="1"/>
@@ -173,22 +165,69 @@
 
     <xsl:choose>
       <xsl:when test="$depth &gt; count($ancestors)">
-        <xsl:apply-templates select="." mode="print-name"/>
+        <xsl:apply-templates select="." mode="print-id-part">
+          <xsl:with-param name="is.id" select="$is.id"/>
+        </xsl:apply-templates>
       </xsl:when>
       <xsl:otherwise>
         <xsl:if test="name($ancestors[$depth])='namespace' or
                       count(ancestor::free-function-group)=0">
-          <xsl:apply-templates select="$ancestors[$depth]" mode="print-name"/>
-          <xsl:value-of select="$separator"/>
+          <xsl:apply-templates select="$ancestors[$depth]" mode="print-id-part">
+            <xsl:with-param name="is.id" select="$is.id"/>
+          </xsl:apply-templates>
+          <xsl:choose>
+            <xsl:when test="$is.id"><xsl:text>.</xsl:text></xsl:when>
+            <xsl:otherwise><xsl:text>::</xsl:text></xsl:otherwise>
+          </xsl:choose>
         </xsl:if>
         <xsl:call-template name="build-fully-qualified-name">
-          <xsl:with-param name="separator" select="$separator"/>
+          <xsl:with-param name="is.id" select="$is.id"/>
           <xsl:with-param name="depth" select="$depth + 1"/>
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
+  <!-- Print the part of a fully qualified name for a single element -->
+  <xsl:template match="*" mode="print-id-part">
+    <xsl:param name="is.id"/>
+
+    <xsl:variable name="part">
+      <xsl:apply-templates select="." mode="print-name"/>
+    </xsl:variable>
+
+    <xsl:variable name="unique-name">
+      <xsl:apply-templates select="." mode="unique.name"/>
+    </xsl:variable>
+
+    <xsl:choose>
+      <xsl:when test=
+        "$is.id and (
+          string-length($part) &gt; $boost.max.id.part.length or
+          $unique-name = 0 or
+          translate($part, '.&lt;&gt;;\:*?&quot;| ', '') != $part
+        )">
+        <xsl:variable name="normalized" select="translate(normalize-space(translate($part, '.&lt;&gt;;\:*?&quot;|_', '            ')), ' ', '_')"/>
+        <xsl:value-of select =
+          "concat(
+            substring($normalized, 1, $boost.max.id.part.length - string-length(generate-id(.) - 1)),
+            concat('_', generate-id(.)))"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$part"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!-- Override this if an id might not be unique -->
+  <xsl:template match="*" mode="unique.name">
+    <xsl:value-of select="1"/>
+  </xsl:template>
+
+  <xsl:template match="function|overloaded-function" mode="unique.name">
+    <xsl:value-of select="number(count(key('named-entities', @name)) = 1)"/>
+  </xsl:template>
+
   <!-- Print the name of the current node -->
   <xsl:template match="*" mode="print-name">
     <xsl:value-of select="@name"/>

Modified: branches/proto/v4/tools/build/v2/build/build-request.jam
==============================================================================
--- branches/proto/v4/tools/build/v2/build/build-request.jam	(original)
+++ branches/proto/v4/tools/build/v2/build/build-request.jam	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -176,21 +176,37 @@
 {
     local result ;
     local parts = [ regex.split $(e) "/" ] ;
-    for local p in $(parts)
+    while $(parts)
     {
+        local p = $(parts[1]) ;
         local m = [ MATCH "([^=]*)=(.*)" : $(p) ] ;
         local lresult ;
+        local feature ;
+        local values ;
         if $(m)
         {
-            local feature = $(m[1]) ;
-            local values = [ regex.split $(m[2]) "," ] ;
+            feature = $(m[1]) ;
+            values = [ regex.split $(m[2]) "," ] ;
             lresult = <$(feature)>$(values) ;
         }
         else
         {
             lresult = [ regex.split $(p) "," ] ;
         }
-
+        
+        if $(feature) && free in [ feature.attributes $(feature) ]
+        {
+            # If we have free feature, then the value is everything
+            # until the end of the command line token. Slashes in
+            # the following string are not taked to mean separation
+            # of properties. Commas are also not interpreted specially.
+            values = $(values:J=,) ;
+            values = $(values) $(parts[2-]) ;
+            values = $(values:J=/) ;
+            lresult = <$(feature)>$(values) ;
+            parts = ;
+        }
+        
         if ! [ MATCH (.*-.*) : $(p) ]
         {
             # property.validate cannot handle subfeatures, so we avoid the check
@@ -209,6 +225,8 @@
         {
             result = $(result)/$(lresult) ;
         }
+        
+        parts = $(parts[2-]) ;
     }
 
     return $(result) ;

Modified: branches/proto/v4/tools/build/v2/index.html
==============================================================================
--- branches/proto/v4/tools/build/v2/index.html	(original)
+++ branches/proto/v4/tools/build/v2/index.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -67,7 +67,7 @@
                 <input type="submit" value="Search">
                 </form> -->
           </ul>
-	<li>Bug tracker  
+	<li>Bug tracker  
 <!--        <li>Rate Boost.Build: Freshmeat    -->
       </ul>
     </p>

Modified: branches/proto/v4/tools/build/v2/nightly.sh
==============================================================================
--- branches/proto/v4/tools/build/v2/nightly.sh	(original)
+++ branches/proto/v4/tools/build/v2/nightly.sh	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -25,5 +25,5 @@
 ./roll.sh > ../roll-log 2>&1
 cd ..
 echo "Uploading packages"
-scp boost-build.zip boost-build.tar.bz2 vladimir_prus_at_[hidden]:/home/groups/b/bo/boost/htdocs/boost-build2 > scp-log
+scp boost-build.zip boost-build.tar.bz2 vladimir_prus,boost_at_[hidden]:/home/groups/b/bo/boost/htdocs/boost-build2 > scp-log
 echo "Nightly build successful"

Modified: branches/proto/v4/tools/build/v2/roll.sh
==============================================================================
--- branches/proto/v4/tools/build/v2/roll.sh	(original)
+++ branches/proto/v4/tools/build/v2/roll.sh	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -65,5 +65,5 @@
 EOF`
 echo $x
 perl -pi -e "s|</body>|$x</body>|" `find doc -name '*.html'`
-scp -r  doc example boost_build.png *.html hacking.txt vladimir_prus_at_[hidden]:/home/groups/b/bo/boost/htdocs/boost-build2
-scp ../userman.pdf vladimir_prus_at_[hidden]:/home/groups/b/bo/boost/htdocs/boost-build2/doc
+scp -r  doc example boost_build.png *.html hacking.txt vladimir_prus,boost_at_[hidden]:/home/groups/b/bo/boost/htdocs/boost-build2
+scp ../userman.pdf vladimir_prus,boost_at_[hidden]:/home/groups/b/bo/boost/htdocs/boost-build2/doc

Modified: branches/proto/v4/tools/build/v2/tools/builtin.jam
==============================================================================
--- branches/proto/v4/tools/build/v2/tools/builtin.jam	(original)
+++ branches/proto/v4/tools/build/v2/tools/builtin.jam	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -27,6 +27,7 @@
 import types/register ;
 import utility ;
 import virtual-target ;
+import message ;
 
 # FIXME: the following generate module import is not needed here but removing it
 # too hastly will break using code (e.g. the main Boost library Jamroot file)

Modified: branches/proto/v4/tools/build/v2/tools/darwin.jam
==============================================================================
--- branches/proto/v4/tools/build/v2/tools/darwin.jam	(original)
+++ branches/proto/v4/tools/build/v2/tools/darwin.jam	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -350,10 +350,14 @@
     prepare-framework-path $(<) ;
 }
 
+# Note that using strip without any options was reported to result in broken
+# binaries, at least on OS X 10.5.5, see:
+#    http://svn.boost.org/trac/boost/ticket/2347
+# So we pass -S -x.
 actions link bind LIBRARIES
 {
     "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH) -framework$(_)$(FRAMEWORK:D=:S=) $(OPTIONS) $(USER_OPTIONS)
-    $(NEED_STRIP)"$(.STRIP)" $(NEED_STRIP)"$(<)"
+    $(NEED_STRIP)"$(.STRIP)" $(NEED_STRIP)-S $(NEED_STRIP)-x $(NEED_STRIP)"$(<)"
 }
 
 rule link.dll

Modified: branches/proto/v4/tools/build/v2/tools/gcc.jam
==============================================================================
--- branches/proto/v4/tools/build/v2/tools/gcc.jam	(original)
+++ branches/proto/v4/tools/build/v2/tools/gcc.jam	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -67,6 +67,8 @@
 
 # Make gcc toolset object files use the "o" suffix on all platforms.
 type.set-generated-target-suffix OBJ : <toolset>gcc : o ;
+type.set-generated-target-suffix OBJ : <toolset>gcc <target-os>windows : o ;
+type.set-generated-target-suffix OBJ : <toolset>gcc <target-os>cygwin : o ;
 
 type.set-generated-target-suffix STATIC_LIB : <toolset>gcc <target-os>cygwin : a ;
 type.set-generated-target-suffix IMPORT_LIB : <toolset>gcc <target-os>cygwin : dll.a ;
@@ -306,33 +308,41 @@
 toolset.flags gcc.compile OPTIONS <profiling>on : -pg ;
 toolset.flags gcc.compile OPTIONS <rtti>off : -fno-rtti ;
 
-# On cygwin and mingw, gcc generates position independent code by default, and
-# warns if -fPIC is specified. This might not be the right way of checking if
-# we are using cygwin. For example, it is possible to run cygwin gcc from NT
-# shell, or using crosscompiling. But we shall solve that problem at a later
-# time. In that case we shall just add another parameter to 'init' and move this
-# login inside 'init'.
-if [ os.name ] != CYGWIN && [ os.name ] != NT
+rule setup-fpic ( targets * : sources * : properties * )
 {
-    # This logic will add -fPIC for all compilations:
-    #
-    # lib a : a.cpp b ;
-    # obj b : b.cpp ;
-    # exe c : c.cpp a d ;
-    # obj d : d.cpp ;
-    #
-    # This all is fine, except that 'd' will be compiled with -fPIC even though
-    # it is not needed, as 'd' is used only in exe. However, it is hard to
-    # detect where a target is going to be used. Alternatively, we can set -fPIC
-    # only when main target type is LIB but than 'b' would be compiled without
-    # -fPIC which would lead to link errors on x86-64. So, compile everything
-    # with -fPIC.
-    #
-    # Yet another alternative would be to create a propagated <sharedable>
-    # feature and set it when building shared libraries, but that would be hard
-    # to implement and would increase the target path length even more.
-    toolset.flags gcc.compile OPTIONS <link>shared : -fPIC ;
+    local link = [ feature.get-values link : $(properties) ] ;
+    if $(link) = shared
+    {        
+        local target = [ feature.get-values target-os : $(properties) ] ;
+        
+        # This logic will add -fPIC for all compilations:
+        #
+        # lib a : a.cpp b ;
+        # obj b : b.cpp ;
+        # exe c : c.cpp a d ;
+        # obj d : d.cpp ;
+        #
+        # This all is fine, except that 'd' will be compiled with -fPIC even though
+        # it is not needed, as 'd' is used only in exe. However, it is hard to
+        # detect where a target is going to be used. Alternatively, we can set -fPIC
+        # only when main target type is LIB but than 'b' would be compiled without
+        # -fPIC which would lead to link errors on x86-64. So, compile everything
+        # with -fPIC.
+        #
+        # Yet another alternative would be to create a propagated <sharedable>
+        # feature and set it when building shared libraries, but that would be hard
+        # to implement and would increase the target path length even more.
+        
+        # On Windows, fPIC is default, specifying -fPIC explicitly leads to
+        # a warning.
+        if $(target) != cygwin && $(target) != windows
+        {
+            OPTIONS on $(targets) += -fPIC ;
+        }        
+    }
 }
+
+# FIXME: this should not use os.name.
 if [ os.name ] != NT && [ os.name ] != OSF && [ os.name ] != HPUX && [ os.name ] != AIX
 {
     # OSF does have an option called -soname but it does not seem to work as
@@ -348,19 +358,31 @@
 toolset.flags gcc.compile INCLUDES <include> ;
 toolset.flags gcc.compile.c++ TEMPLATE_DEPTH <c++-template-depth> ;
 
+rule compile.c++.pch ( targets * : sources * : properties * )
+{
+    setup-fpic $(targets) : $(sources) : $(properties) ;
+}
 
 actions compile.c++.pch
 {
     "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
 }
 
+rule compile.c.pch ( targets * : sources * : properties * )
+{
+    setup-fpic $(targets) : $(sources) : $(properties) ;
+}
+
 actions compile.c.pch
 {
     "$(CONFIG_COMMAND)" -x c-header $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
 }
 
-rule compile.c++
+rule compile.c++ ( targets * : sources * : properties * )
 {
+    setup-threading $(targets) : $(sources) : $(properties) ;
+    setup-fpic $(targets) : $(sources) : $(properties) ;
+    
     # Some extensions are compiled as C++ by default. For others, we need to
     # pass -x c++. We could always pass -x c++ but distcc does not work with it.
     if ! $(>:S) in .cc .cp .cxx .cpp .c++ .C
@@ -385,8 +407,11 @@
     }
 }
 
-rule compile.c
+rule compile.c ( targets * : sources * : properties * )
 {
+    setup-threading $(targets) : $(sources) : $(properties) ;
+    setup-fpic $(targets) : $(sources) : $(properties) ;
+    
     # If we use the name g++ then default file suffix -> language mapping does
     # not work. So have to pass -x option. Maybe, we can work around this by
     # allowing the user to specify both C and C++ compiler names.
@@ -681,6 +706,7 @@
 # Declare actions for linking.
 rule link ( targets * : sources * : properties * )
 {
+    setup-threading $(targets) : $(sources) : $(properties) ;
     SPACE on $(targets) = " " ;
     # Serialize execution of the 'link' action, since running N links in
     # parallel is just slower. For now, serialize only gcc links, it might be a
@@ -744,6 +770,7 @@
 
 rule link.dll ( targets * : sources * : properties * )
 {
+    setup-threading $(targets) : $(sources) : $(properties) ;
     SPACE on $(targets) = " " ;
     JAM_SEMAPHORE on $(targets) = <s>gcc-link-semaphore ;
 }
@@ -754,52 +781,64 @@
     "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
 }
 
-# Set up threading support. It is somewhat contrived, so perform it at the end,
-# to avoid cluttering other code.
-
-if [ os.on-windows ]
+rule setup-threading ( targets * : sources * : properties * )
 {
-    toolset.flags gcc OPTIONS <threading>multi : -mthreads ;
-}
-else if [ modules.peek : UNIX ]
-{
-    switch [ modules.peek : JAMUNAME ]
-    {
-    case SunOS* :
-        {
-        toolset.flags gcc OPTIONS <threading>multi : -pthreads ;
-        toolset.flags gcc FINDLIBS-SA : rt ;
-        }
-    case BeOS :
+    local threading = [ feature.get-values threading : $(properties) ] ;
+    if $(threading) = multi
+    {        
+        local target = [ feature.get-values target-os : $(properties) ] ;
+        local option ;
+        local libs ;
+        
+        switch $(target)
         {
-        # BeOS has no threading options, so do not set anything here.
-        }
-    case *BSD :
-        {
-        toolset.flags gcc OPTIONS <threading>multi : -pthread ;
-        # There is no -lrt on BSD.
-        }
-    case DragonFly :
-        {
-        toolset.flags gcc OPTIONS <threading>multi : -pthread ;
-        # There is no -lrt on BSD - DragonFly is a FreeBSD variant, which
-        # annoyingly does not say it is a *BSD.
-        }
-    case IRIX :
-        {
-        # gcc on IRIX does not support multi-threading so do not set anything
-        # here.
+            case windows :
+            {
+                option = -mthreads ;
+            }
+            case cygwin :
+            {
+                option = -mthreads ;
+            }
+            case sunos :
+            {
+                option = -pthreads ;
+                libs = rt ;
+            }
+            case beos :
+            {            
+                # BeOS has no threading options, so do not set anything here.
+            }        
+            case *bsd :
+            {
+                option = -pthread ;
+                # There is no -lrt on BSD.
+            }
+            case sgi :
+            {
+                # gcc on IRIX does not support multi-threading so do not set anything
+                # here.
+            }
+            case darwin :
+            {
+                # Darwin has no threading options so do not set anything here.
+            }
+            case * :
+            {
+                option = -pthread ;
+                libs = rt ;
+            }
         }
-    case Darwin :
+    
+        if $(option)
         {
-        # Darwin has no threading options so do not set anything here.
+            OPTIONS on $(targets) += $(option) ;
         }
-    case * :
+        if $(libs)
         {
-        toolset.flags gcc OPTIONS <threading>multi : -pthread ;
-        toolset.flags gcc FINDLIBS-SA : rt ;
+            FINDLIBS-SA on $(targets) += $(libs) ;
         }
-    }
+    }    
 }
 
 local rule cpu-flags ( toolset variable : architecture : instruction-set + : values + : default ? )

Modified: branches/proto/v4/tools/build/v2/tools/types/exe.jam
==============================================================================
--- branches/proto/v4/tools/build/v2/tools/types/exe.jam	(original)
+++ branches/proto/v4/tools/build/v2/tools/types/exe.jam	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -1,5 +1,9 @@
 # Copyright David Abrahams 2004. Distributed under the Boost
 # Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-type EXE : exe : : NT CYGWIN ;
-type EXE ;
+
+import type ;
+
+type.register EXE ;
+type.set-generated-target-suffix EXE : <target-os>windows : "exe" ;
+type.set-generated-target-suffix EXE : <target-os>cygiwn : "exe" ;

Modified: branches/proto/v4/tools/build/v2/tools/types/lib.jam
==============================================================================
--- branches/proto/v4/tools/build/v2/tools/types/lib.jam	(original)
+++ branches/proto/v4/tools/build/v2/tools/types/lib.jam	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -7,23 +7,25 @@
 
 type.register LIB ;
 
-if [ os.on-unix ]
-{
-    type.set-generated-target-prefix LIB : : "lib" ;
-}
-
-type STATIC_LIB : lib a : LIB : NT CYGWIN ;
-type STATIC_LIB : a : LIB : MACOSX ;
-type STATIC_LIB : a : LIB ;
+type.set-generated-target-prefix LIB : : "lib" ;
+type.set-generated-target-prefix LIB : <target-os>windows : "" ;
+type.set-generated-target-prefix LIB : <target-os>cygwin : "" ;
+
+# FIXME: should not register both extensions on both
+# platforms.
+type.register STATIC_LIB : a lib : LIB ;
+
+type.set-generated-target-suffix STATIC_LIB : <target-os>windows : lib ;
+type.set-generated-target-suffix STATIC_LIB : <target-os>cygwin : lib ;
 type.set-generated-target-prefix STATIC_LIB : : lib ;
 
 type IMPORT_LIB : : STATIC_LIB ;
 type.set-generated-target-suffix IMPORT_LIB : : lib ;
 type.set-generated-target-prefix IMPORT_LIB : : "" ;
 
-type SHARED_LIB : dll : LIB : NT CYGWIN ;
-type SHARED_LIB : dylib : LIB : MACOSX ;
-type SHARED_LIB : so : LIB ;
+type.register SHARED_LIB : so dll dylib : LIB ;
+type.set-generated-target-suffix SHARED_LIB : <target-os>windows : dll ;
+type.set-generated-target-suffix SHARED_LIB : <target-os>darwin : dylib ;
 
 type SEARCHED_LIB : : LIB ;
 # This is needed so that when we create a target of SEARCHED_LIB

Modified: branches/proto/v4/tools/build/v2/tools/types/obj.jam
==============================================================================
--- branches/proto/v4/tools/build/v2/tools/types/obj.jam	(original)
+++ branches/proto/v4/tools/build/v2/tools/types/obj.jam	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -1,5 +1,9 @@
 # Copyright David Abrahams 2004. Distributed under the Boost
 # Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-type OBJ : obj : : NT CYGWIN ;
-type OBJ : o ;
+
+import type ;
+
+type.register OBJ : o obj ;
+type.set-generated-target-suffix OBJ : <target-os>windows : obj ;
+type.set-generated-target-suffix OBJ : <target-os>cygwin : obj ;

Modified: branches/proto/v4/tools/inspect/index.html
==============================================================================
--- branches/proto/v4/tools/inspect/index.html	(original)
+++ branches/proto/v4/tools/inspect/index.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -33,8 +33,8 @@
   inspect.cpp</a></li>
   <li>link_check.hpp and <a href="link_check.cpp">
   link_check.cpp</a></li>
-  <li>long_name_check.hpp and
-  long_name_check.cpp</li>
+  <li>path_name_check.hpp and
+  path_name_check.cpp</li>
   <li>tab_check.hpp and <a href="tab_check.cpp">
   tab_check.cpp</a></li>
 </ul>
@@ -56,4 +56,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>

Modified: branches/proto/v4/tools/jam/doc/bjam.qbk
==============================================================================
--- branches/proto/v4/tools/jam/doc/bjam.qbk	(original)
+++ branches/proto/v4/tools/jam/doc/bjam.qbk	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -341,7 +341,7 @@
 
 [   [] []
     [[lines
-        [line [@http://www-306.ibm.com/software/awdtools/vacpp/ =vacpp=]]
+        [line [@http://www.ibm.com/software/awdtools/vacpp/ =vacpp=]]
         [line IBM VisualAge C++]
         ]]
     [[list

Modified: branches/proto/v4/tools/jam/src/builtins.c
==============================================================================
--- branches/proto/v4/tools/jam/src/builtins.c	(original)
+++ branches/proto/v4/tools/jam/src/builtins.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -1135,7 +1135,7 @@
 void backtrace( FRAME * frame )
 {
     if ( !frame ) return;
-    while ( frame = frame->prev )
+    while ( ( frame = frame->prev ) )
         backtrace_line( frame );
 }
 
@@ -1289,13 +1289,12 @@
 
     string   in[ 1 ];
     string   out[ 1 ];
-    char   * end;          /* Last character of the part of string still to be
-                            * processed.
-                            */
-    char   * current;      /* Working pointer. */
-    int      dotdots = 0;  /* Number of '..' elements seen and not processed
-                           /* yet.
-                            */
+	/* Last character of the part of string still to be processed. */
+    char   * end;
+	/* Working pointer. */
+    char   * current;
+	/* Number of '..' elements seen and not processed yet. */
+    int      dotdots = 0;
     int      rooted  = 0;
     char   * result  = 0;
 

Modified: branches/proto/v4/tools/jam/src/compile.c
==============================================================================
--- branches/proto/v4/tools/jam/src/compile.c	(original)
+++ branches/proto/v4/tools/jam/src/compile.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -295,7 +295,7 @@
 {
     LIST * r = 0;
     LIST * l;
-    while ( l = parse_evaluate( p->left, frame ) )
+    while ( ( l = parse_evaluate( p->left, frame ) ) )
     {
         list_free( l );
         if ( r ) list_free( r );
@@ -753,12 +753,13 @@
     return locals;
 }
 
-static int python_instance_number = 0;
-
 RULE *
 enter_rule( char *rulename, module_t *target_module );
 
 #ifdef HAVE_PYTHON
+
+static int python_instance_number = 0;
+
 static LIST*
 call_python_function(RULE* r, FRAME* frame)
 {
@@ -863,6 +864,7 @@
         python = bindmodule("__python__");
     return python;
 }
+
 #endif
 
 

Modified: branches/proto/v4/tools/jam/src/debug.c
==============================================================================
--- branches/proto/v4/tools/jam/src/debug.c	(original)
+++ branches/proto/v4/tools/jam/src/debug.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -114,7 +114,7 @@
         profile_total.cumulative += p->net;
         profile_total.memory += p->memory;
     }
-    printf( "%10d %12.6f %12.6f %12.8f %10d %10d %s\n", p->num_entries,
+    printf( "%10ld %12.6f %12.6f %12.8f %10ld %10ld %s\n", p->num_entries,
         cumulative, net, q, p->memory, mem_each, p->name );
 }
 

Modified: branches/proto/v4/tools/jam/src/expand.c
==============================================================================
--- branches/proto/v4/tools/jam/src/expand.c	(original)
+++ branches/proto/v4/tools/jam/src/expand.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -267,14 +267,14 @@
             string_copy( variable, vars->string );
             varname = variable->value;
 
-            if ( colon = strchr( varname, MAGIC_COLON ) )
+            if ( ( colon = strchr( varname, MAGIC_COLON ) ) )
             {
                 string_truncate( variable, colon - varname );
                 var_edit_parse( colon + 1, &edits );
             }
 
             /* Look for [x-y] subscripting. sub1 and sub2 are x and y. */
-            if ( bracket = strchr( varname, MAGIC_LEFT ) )
+            if ( ( bracket = strchr( varname, MAGIC_LEFT ) ) )
             {
                 /* Make all syntax errors in [] subscripting result in the same
                  * behavior: silenty return an empty expansion (by setting sub2
@@ -577,7 +577,7 @@
             fp->ptr = "";
             fp->len = 0;
         }
-        else if ( p = strchr( mods, MAGIC_COLON ) )
+        else if ( ( p = strchr( mods, MAGIC_COLON ) ) )
         {
             *p = 0;
             fp->ptr = ++mods;

Modified: branches/proto/v4/tools/jam/src/fileunix.c
==============================================================================
--- branches/proto/v4/tools/jam/src/fileunix.c	(original)
+++ branches/proto/v4/tools/jam/src/fileunix.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -167,10 +167,8 @@
             printf( "scan directory %s\n", dir );
 
         string_new( filename );
-        while ( dirent = readdir( dd ) )
+        while ( ( dirent = readdir( dd ) ) )
         {
-            file_info_t * ff = 0;
-
             # ifdef old_sinix
             /* Broken structure definition on sinix. */
             f.f_base.ptr = dirent->d_name - 2;

Modified: branches/proto/v4/tools/jam/src/hash.c
==============================================================================
--- branches/proto/v4/tools/jam/src/hash.c	(original)
+++ branches/proto/v4/tools/jam/src/hash.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -103,7 +103,6 @@
 static unsigned int jenkins_one_at_a_time_hash(const unsigned char *key)
 {
     unsigned int hash = 0;
-    size_t i;
 
     while ( *key )
     {
@@ -114,9 +113,11 @@
     hash += (hash << 3);
     hash ^= (hash >> 11);
     hash += (hash << 15);
+	
     return hash;
 }
 
+/*
 static unsigned int knuth_hash(const unsigned char *key)
 {
     unsigned int keyval = *key;
@@ -124,14 +125,14 @@
         keyval = keyval * 2147059363 + *key++;
     return keyval;
 }
+*/
 
 static unsigned int hash_keyval( const char * key_ )
 {
-    /**
-    return knuth_hash((const unsigned char *)key_);
-    /*/
+    /*
+	return knuth_hash((const unsigned char *)key_);
+	*/
     return jenkins_one_at_a_time_hash((const unsigned char *)key_);
-    /**/
 }
 
 #define hash_bucket(hp,keyval) ((hp)->tab.base + ( (keyval) % (hp)->tab.nel ))
@@ -364,7 +365,7 @@
     hp->items.size = sizeof( struct hashhdr ) + ALIGNED( datalen );
     hp->items.list = -1;
     hp->items.nel = 0;
-    hp->inel = /* */ 11 /*/ 47 /* */;
+    hp->inel = 11 /* 47 */;
     hp->name = name;
 
     return hp;
@@ -440,14 +441,14 @@
 
     for ( i = nel; i > 0; --i )
     {
-        if ( here = ( *tab++ != (ITEM *)0 ) )
+        if ( ( here = ( *tab++ != (ITEM *)0 ) ) )
             count++;
         if ( here && !run )
             sets++;
         run = here;
     }
 
-    printf( "%s table: %d+%d+%d (%dK+%dK) items+table+hash, %f density\n",
+    printf( "%s table: %d+%d+%d (%dK+%ldK) items+table+hash, %f density\n",
         hp->name,
         count,
         hp->items.nel,

Modified: branches/proto/v4/tools/jam/src/hcache.c
==============================================================================
--- branches/proto/v4/tools/jam/src/hcache.c	(original)
+++ branches/proto/v4/tools/jam/src/hcache.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -327,10 +327,10 @@
         else if ( c->age > maxage )
             continue;
 
-        sprintf( includes_count_str, "%lu", list_length( c->includes ) );
-        sprintf( hdrscan_count_str, "%lu", list_length( c->hdrscan ) );
-        sprintf( time_str, "%lu", c->time );
-        sprintf( age_str, "%lu", c->age );
+        sprintf( includes_count_str, "%lu", (long unsigned) list_length( c->includes ) );
+        sprintf( hdrscan_count_str, "%lu", (long unsigned) list_length( c->hdrscan ) );
+        sprintf( time_str, "%lu", (long unsigned) c->time );
+        sprintf( age_str, "%lu", (long unsigned) c->age );
 
         write_netstring( f, CACHE_RECORD_HEADER );
         write_netstring( f, c->boundname );

Modified: branches/proto/v4/tools/jam/src/hdrmacro.c
==============================================================================
--- branches/proto/v4/tools/jam/src/hdrmacro.c	(original)
+++ branches/proto/v4/tools/jam/src/hdrmacro.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -46,8 +46,6 @@
  *      just to invoke a rule.
  */
 
-static LIST * header_macros1( LIST * l, char * file, int rec, regexp * re[] );
-
 /* this type is used to store a dictionary of file header macros */
 typedef struct header_macro
 {

Modified: branches/proto/v4/tools/jam/src/headers.c
==============================================================================
--- branches/proto/v4/tools/jam/src/headers.c	(original)
+++ branches/proto/v4/tools/jam/src/headers.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -60,7 +60,9 @@
 {
     LIST   * hdrscan;
     LIST   * hdrrule;
+	#ifndef OPT_HEADER_CACHE_EXT
     LIST   * headlist = 0;
+	#endif
     regexp * re[ MAXINC ];
     int rec = 0;
 

Modified: branches/proto/v4/tools/jam/src/jam.c
==============================================================================
--- branches/proto/v4/tools/jam/src/jam.c	(original)
+++ branches/proto/v4/tools/jam/src/jam.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -300,7 +300,7 @@
         globs.timeout = atoi( s );
 
     /* Turn on/off debugging */
-    for ( n = 0; s = getoptval( optv, 'd', n ); ++n )
+    for ( n = 0; ( s = getoptval( optv, 'd', n ) ); ++n )
     {
         int i;
 
@@ -414,7 +414,7 @@
         var_defines( othersyms, 1 );
 
         /* Load up variables set on command line. */
-        for ( n = 0; s = getoptval( optv, 's', n ); ++n )
+        for ( n = 0; ( s = getoptval( optv, 's', n ) ); ++n )
         {
             char *symv[2];
             symv[ 0 ] = s;
@@ -452,7 +452,7 @@
         {
             FRAME frame[ 1 ];
             frame_init( frame );
-            for ( n = 0; s = getoptval( optv, 'f', n ); ++n )
+            for ( n = 0; ( s = getoptval( optv, 'f', n ) ); ++n )
                 parse_file( s, frame );
 
             if ( !n )
@@ -462,11 +462,11 @@
         status = yyanyerrors();
 
         /* Manually touch -t targets. */
-        for ( n = 0; s = getoptval( optv, 't', n ); ++n )
+        for ( n = 0; ( s = getoptval( optv, 't', n ) ); ++n )
             touch_target( s );
 
         /* If an output file is specified, set globs.cmdout to that. */
-        if ( s = getoptval( optv, 'o', 0 ) )
+        if ( ( s = getoptval( optv, 'o', 0 ) ) )
         {
             if ( !( globs.cmdout = fopen( s, "w" ) ) )
             {

Modified: branches/proto/v4/tools/jam/src/make.c
==============================================================================
--- branches/proto/v4/tools/jam/src/make.c	(original)
+++ branches/proto/v4/tools/jam/src/make.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -195,7 +195,7 @@
             if ( DEBUG_FATE )
             {
                 printf( "fate change  %s from %s to %s (as dependant of %s)\n",
-                        p->name, target_fate[ fate0 ], target_fate[ p->fate ], t->name );
+                        p->name, target_fate[ (int) fate0 ], target_fate[ (int) p->fate ], t->name );
             }
 
             /* If we are done visiting it, go back and make sure its dependants
@@ -224,7 +224,7 @@
         {
             if ( DEBUG_FATE )
                 printf( "fate change  %s from %s to %s (by rebuild)\n",
-                        r->name, target_fate[ r->fate ], target_fate[ T_FATE_REBUILD ] );
+                        r->name, target_fate[ (int) r->fate ], target_fate[ T_FATE_REBUILD ] );
 
             /* Force rebuild it. */
             r->fate = T_FATE_REBUILD;
@@ -253,7 +253,6 @@
 )  /* forcibly touch all (real) targets */
 {
     TARGETS    * c;
-    TARGETS    * d;
     TARGET     * ptime = t;
     time_t       last;
     time_t       leaf;
@@ -352,7 +351,7 @@
         case T_BIND_MISSING:
         case T_BIND_PARENTS:
             printf( "time\t--\t%s%s: %s\n",
-                spaces( depth ), t->name, target_bind[ t->binding ] );
+                spaces( depth ), t->name, target_bind[ (int) t->binding ] );
             break;
 
         case T_BIND_EXISTS:
@@ -421,7 +420,7 @@
         if ( DEBUG_FATE )
             if ( fate < c->target->fate )
                 printf( "fate change %s from %s to %s by dependency %s\n",
-                    t->name, target_fate[fate], target_fate[c->target->fate],
+                    t->name, target_fate[(int) fate], target_fate[(int) c->target->fate],
                     c->target->name );
 #endif
     }
@@ -540,6 +539,7 @@
     }
 #ifdef OPT_GRAPH_DEBUG_EXT
     if ( DEBUG_FATE && ( fate != savedFate ) )
+	{
         if ( savedFate == T_FATE_STABLE )
             printf( "fate change  %s set to %s%s\n", t->name,
                 target_fate[ fate ], oldTimeStamp ? " (by timestamp)" : "" );
@@ -547,6 +547,7 @@
             printf( "fate change  %s from %s to %s%s\n", t->name,
                 target_fate[ savedFate ], target_fate[ fate ],
                 oldTimeStamp ? " (by timestamp)" : "" );
+	}
 #endif
 
     /* Step 4e: handle missing files */
@@ -635,7 +636,7 @@
         flag = "*";
 
     if ( DEBUG_MAKEPROG )
-        printf( "made%s\t%s\t%s%s\n", flag, target_fate[ t->fate ],
+        printf( "made%s\t%s\t%s%s\n", flag, target_fate[ (int) t->fate ],
             spaces( depth ), t->name );
 }
 
@@ -735,7 +736,7 @@
     for ( c = t->depends; c; c = c->next )
     {
         printf( "  %s       : Depends on %s (%s)", spaces( depth ),
-               target_name( c->target ), target_fate[ c->target->fate ] );
+               target_name( c->target ), target_fate[ (int) c->target->fate ] );
         if ( c->target->time == t->time )
             printf( " (max time)");
         printf( "\n" );

Modified: branches/proto/v4/tools/jam/src/make1.c
==============================================================================
--- branches/proto/v4/tools/jam/src/make1.c	(original)
+++ branches/proto/v4/tools/jam/src/make1.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -66,7 +66,7 @@
 
 #include <stdlib.h>
 
-#if defined(sun) || defined(__sun)
+#if ! defined(NT) || defined(__GNUC__)
     #include <unistd.h>  /* for unlink */
 #endif
 
@@ -914,8 +914,8 @@
     ACTIONS  * a0;
 
     /* Step through actions. Actions may be shared with other targets or grouped
-    /* using RULE_TOGETHER, so actions already seen are skipped.
-    */
+     * using RULE_TOGETHER, so actions already seen are skipped.
+     */
     for ( a0 = t->actions ; a0; a0 = a0->next )
     {
         RULE         * rule = a0->action->rule;

Modified: branches/proto/v4/tools/jam/src/modules/order.c
==============================================================================
--- branches/proto/v4/tools/jam/src/modules/order.c	(original)
+++ branches/proto/v4/tools/jam/src/modules/order.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -77,7 +77,7 @@
     LIST* arg = lol_get( frame->args, 0 );  
     LIST* tmp;
     LIST* result = 0;
-    int src, dst;
+    int src;
 
     /* We need to create a graph of order dependencies between
        the passed objects. We assume that there are no duplicates

Modified: branches/proto/v4/tools/jam/src/modules/property-set.c
==============================================================================
--- branches/proto/v4/tools/jam/src/modules/property-set.c	(original)
+++ branches/proto/v4/tools/jam/src/modules/property-set.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -45,7 +45,9 @@
 {
     LIST* properties = lol_get( frame->args, 0 );
     LIST* sorted = 0;
+#if 0
     LIST* order_sensitive = 0;
+#endif
     LIST* unique;
     LIST* tmp;
     LIST* val;

Modified: branches/proto/v4/tools/jam/src/output.c
==============================================================================
--- branches/proto/v4/tools/jam/src/output.c	(original)
+++ branches/proto/v4/tools/jam/src/output.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -71,7 +71,7 @@
             if ( action )
             {
                 /* But only output for non-quietly actions. */
-                fprintf( bjam_out, "%d second time limit exceeded\n", globs.timeout );
+                fprintf( bjam_out, "%ld second time limit exceeded\n", globs.timeout );
             }
             break;
         }

Modified: branches/proto/v4/tools/jam/src/pathunix.c
==============================================================================
--- branches/proto/v4/tools/jam/src/pathunix.c	(original)
+++ branches/proto/v4/tools/jam/src/pathunix.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -122,7 +122,7 @@
     p = 0;
     q = file;
 
-    while ( q = (char *)memchr( q, '.', end - q ) )
+    while ( ( q = (char *)memchr( q, '.', end - q ) ) )
         p = q++;
 
     if ( p )

Modified: branches/proto/v4/tools/jam/src/pwd.c
==============================================================================
--- branches/proto/v4/tools/jam/src/pwd.c	(original)
+++ branches/proto/v4/tools/jam/src/pwd.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -6,25 +6,29 @@
 #include "lists.h"
 #include "newstr.h"
 #include "pathsys.h"
+#include "mem.h"
 
 #include <limits.h>
+#include <errno.h>
 
 /* MinGW on windows declares PATH_MAX in limits.h */
 #if defined(NT) && ! defined(__GNUC__)
 #include <direct.h>
 #define PATH_MAX _MAX_PATH
 #else
-#include <limits.h>
 #include <unistd.h>
 #if defined(__COMO__)
      #include <linux/limits.h>
 #endif
 #endif
 
+#ifndef PATH_MAX
+	#define PATH_MAX 1024
+#endif
+
 /* The current directory can't change in bjam, so optimize this to cache
 ** the result.
 */
-static char pwd_buffer[PATH_MAX];
 static char * pwd_result = NULL;
 
 
@@ -33,20 +37,30 @@
 {
     if (!pwd_result)
     {
-        if (getcwd(pwd_buffer, sizeof(pwd_buffer)) == NULL)
-        {
+		int buffer_size = PATH_MAX;
+		char * result_buffer = 0;
+		do
+		{
+			char * buffer = BJAM_MALLOC_RAW(buffer_size);
+			result_buffer = getcwd(buffer,buffer_size);
+			if (result_buffer)
+			{
+				#ifdef NT
+				pwd_result = short_path_to_long_path(result_buffer);
+				#else
+				pwd_result = newstr(result_buffer);
+				#endif
+			}
+			buffer_size *= 2;
+			BJAM_FREE_RAW(buffer);
+		}
+		while (!pwd_result && errno == ERANGE);
+		
+		if (!pwd_result)
+		{
             perror("can not get current directory");
             return L0;
         }
-        else
-        {
-#ifdef NT
-            pwd_result = short_path_to_long_path(pwd_buffer);
-#else
-            pwd_result = newstr(pwd_buffer);
-#endif
-        }
     }
     return list_new(L0, pwd_result);
 }
-

Modified: branches/proto/v4/tools/jam/src/regexp.c
==============================================================================
--- branches/proto/v4/tools/jam/src/regexp.c	(original)
+++ branches/proto/v4/tools/jam/src/regexp.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -309,7 +309,7 @@
     register char *ret;
     register char *br;
     register char *ender;
-    register int parno;
+    register int parno = 0;
     int flags;
 
     *flagp = HASWIDTH;  /* Tentatively. */

Modified: branches/proto/v4/tools/jam/src/rules.c
==============================================================================
--- branches/proto/v4/tools/jam/src/rules.c	(original)
+++ branches/proto/v4/tools/jam/src/rules.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -358,8 +358,6 @@
 
 TARGETS * targetchain( TARGETS * chain, TARGETS * targets )
 {
-    TARGETS * c;
-
     if ( !targets ) return chain;
     if ( !chain   ) return targets;
 

Modified: branches/proto/v4/tools/jam/src/search.c
==============================================================================
--- branches/proto/v4/tools/jam/src/search.c	(original)
+++ branches/proto/v4/tools/jam/src/search.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -124,7 +124,7 @@
     f->f_grist.ptr = 0;
     f->f_grist.len = 0;
 
-    if ( varlist = var_get( "LOCATE" ) )
+    if ( ( varlist = var_get( "LOCATE" ) ) )
       {
         f->f_root.ptr = varlist->string;
         f->f_root.len = strlen( varlist->string );
@@ -139,7 +139,7 @@
         timestamp( buf->value, time );
         found = 1;
     }
-    else if ( varlist = var_get( "SEARCH" ) )
+    else if ( ( varlist = var_get( "SEARCH" ) ) )
     {
         while ( varlist )
         {

Modified: branches/proto/v4/tools/jam/src/timestamp.c
==============================================================================
--- branches/proto/v4/tools/jam/src/timestamp.c	(original)
+++ branches/proto/v4/tools/jam/src/timestamp.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -74,8 +74,10 @@
     BINDING    binding;
     BINDING  * b = &binding;
     string     buf[ 1 ];
+#ifdef DOWNSHIFT_PATHS
     string     path;
     char     * p;
+#endif
 
 #ifdef DOWNSHIFT_PATHS
     string_copy( &path, target );

Modified: branches/proto/v4/tools/jam/src/variable.c
==============================================================================
--- branches/proto/v4/tools/jam/src/variable.c	(original)
+++ branches/proto/v4/tools/jam/src/variable.c	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -110,7 +110,7 @@
 
         if ( ( val = strchr( *e, '=' ) ) || ( val = *e + strlen( *e ) ) )
 # else
-        if ( val = strchr( *e, '=' ) )
+        if ( ( val = strchr( *e, '=' ) ) )
 # endif
         {
             LIST * l = L0;

Deleted: branches/proto/v4/tools/quickbook/doc/html/images/alert.png
==============================================================================
Binary file. No diff available.

Deleted: branches/proto/v4/tools/quickbook/doc/html/images/caution.png
==============================================================================
Binary file. No diff available.

Deleted: branches/proto/v4/tools/quickbook/doc/html/images/home.png
==============================================================================
Binary file. No diff available.

Deleted: branches/proto/v4/tools/quickbook/doc/html/images/important.png
==============================================================================
Binary file. No diff available.

Deleted: branches/proto/v4/tools/quickbook/doc/html/images/next.png
==============================================================================
Binary file. No diff available.

Deleted: branches/proto/v4/tools/quickbook/doc/html/images/note.png
==============================================================================
Binary file. No diff available.

Deleted: branches/proto/v4/tools/quickbook/doc/html/images/prev.png
==============================================================================
Binary file. No diff available.

Deleted: branches/proto/v4/tools/quickbook/doc/html/images/smiley.png
==============================================================================
Binary file. No diff available.

Deleted: branches/proto/v4/tools/quickbook/doc/html/images/tip.png
==============================================================================
Binary file. No diff available.

Deleted: branches/proto/v4/tools/quickbook/doc/html/images/up.png
==============================================================================
Binary file. No diff available.

Deleted: branches/proto/v4/tools/quickbook/doc/html/images/warning.png
==============================================================================
Binary file. No diff available.

Deleted: branches/proto/v4/tools/quickbook/doc/html/index.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/index.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,79 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Quickbook 1.4</title>
-<link rel="stylesheet" href="../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="index.html" title="Quickbook 1.4">
-<link rel="next" href="quickbook/intro.html" title="Introduction">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav"><a accesskey="n" href="quickbook/intro.html"><img src="../../../../doc/html/images/next.png" alt="Next"></a></div>
-<div class="article" lang="en">
-<div class="titlepage">
-<div>
-<div><h2 class="title">
-<a name="quickbook"></a>Quickbook 1.4</h2></div>
-<div><div class="authorgroup">
-<div class="author"><h3 class="author">
-<span class="firstname">Joel</span> <span class="surname">de Guzman</span>
-</h3></div>
-<div class="author"><h3 class="author">
-<span class="firstname">Eric</span> <span class="surname">Niebler</span>
-</h3></div>
-</div></div>
-<div><p class="copyright">Copyright © 2002, 2004, 2006 Joel de Guzman,
-      Eric Niebler</p></div>
-<div><div class="legalnotice">
-<a name="id4946499"></a><p>
-        Distributed under the Boost Software License, Version 1.0. (See accompanying
-        file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></div>
-</div>
-<hr>
-</div>
-<div class="toc">
-<p><b>Table of Contents</b></p>
-<dl>
-<dt><span class="section"> Introduction</span></dt>
-<dt><span class="section"> Change Log</span></dt>
-<dt><span class="section"> Syntax Summary</span></dt>
-<dd><dl>
-<dt><span class="section">Comments</span></dt>
-<dt><span class="section"> Phrase Level Elements</span></dt>
-<dt><span class="section"> Block Level Elements</span></dt>
-</dl></dd>
-<dt><span class="section"> Installation and configuration</span></dt>
-<dd><dl>
-<dt><span class="section"> Mac OS X</span></dt>
-<dt><span class="section"> Windows 2000, XP, 2003, Vista</span></dt>
-<dt><span class="section"> Debian, Ubuntu</span></dt>
-</dl></dd>
-<dt><span class="section"> Editor Support</span></dt>
-<dd><dl>
-<dt><span class="section"> Scintilla Text Editor</span></dt>
-<dt><span class="section">KDE Support</span></dt>
-</dl></dd>
-<dt><span class="section"> Frequently Asked Questions</span></dt>
-<dt><span class="section"> Quick Reference</span></dt>
-</dl>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: July 29, 2008 at 05:49:54 GMT</small></p></td>
-<td align="right"><div class="copyright-footer"></div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav"><a accesskey="n" href="quickbook/intro.html"><img src="../../../../doc/html/images/next.png" alt="Next"></a></div>
-</body>
-</html>

Deleted: branches/proto/v4/tools/quickbook/doc/html/quickbook/change_log.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/quickbook/change_log.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,168 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Change Log</title>
-<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Quickbook 1.4">
-<link rel="up" href="../index.html" title="Quickbook 1.4">
-<link rel="prev" href="intro.html" title="Introduction">
-<link rel="next" href="syntax.html" title="Syntax Summary">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="intro.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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="id4910849"></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].
-      </li>
-<li>
-        Better xml output (pretty layout). Check out the generated XML.
-      </li>
-<li>
-        Regression testing facility: to make sure your document will always be compatible
-        (full backward compatibility) regardless of changes to QuickBook.
-      </li>
-<li>
-        Code cleanup and refactoring.
-      </li>
-<li>
-        Allow phrase markup in the doc-info.
-      </li>
-<li>
-        Preformatted code blocks via ``code`` (double ticks) allows code in tables
-        and lists, for example.
-      </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.
-      </li>
-<li>
-        Better (intuitive) paragraph termination. Some markups may terminate a paragraph.
-        Example:
-<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>
-</li>
-<li>
-        Fully qualified section and headers. Subsection names are concatenated to
-        the ID to avoid clashing. Example: <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.
-      </li>
-<li>
-        [xinclude] fixes up the relative path to the target XML file when input_directory
-        is not the same as the output_directory.
-      </li>
-<li>
-        Allow untitled tables.
-      </li>
-<li>
-        Allow phrase markups in section titles.
-      </li>
-<li>
-        Allow escaping back to QuickBook from code, code blocks and inline code.
-      </li>
-<li>
-        Footnotes, with the [footnote This is the footnote] syntax.
-      </li>
-<li>
-        Post-processor bug fix for escaped XML code that it does not recognize.
-      </li>
-<li>
-        Replaceable, with the [~replacement] syntax.
-      </li>
-</ul></div>
-<a name="quickbook.change_log.version_1_4"></a><h4>
-<a name="id4912575"></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
-      </li>
-<li>
-        Code changes to allow full recursion (i.e. Collectors and push/pop functions)
-      </li>
-<li>
-        Various code cleanup/maintenance
-      </li>
-<li>
-        Templates!
-      </li>
-<li>
-        [conceptref] for referencing BoostBook &lt;concept&gt; entities.
-      </li>
-<li>
-        Allow escape of spaces. The escaped space is removed from the output. Syntax:
-        <code class="computeroutput"><span class="special">\</span> </code>.
-      </li>
-<li>
-        Nested comments are now allowed.
-      </li>
-<li>
-        Quickbook blocks can nest inside comments.
-      </li>
-<li>
-<a class="link" href="syntax/block.html#quickbook.syntax.block.import" title="Import">Import</a> facility.
-      </li>
-<li>
-        Callouts on imported code
-      </li>
-<li>
-        Simple markups can now span a whole block.
-      </li>
-<li>
-<a class="link" href="syntax/block.html#quickbook.syntax.block.blurbs" title="Blurbs">Blurbs</a>, <a class="link" href="syntax/block.html#quickbook.syntax.block.admonitions" title="Admonitions">Admonitions</a>
-        and table cells (see <a class="link" href="syntax/block.html#quickbook.syntax.block.tables" title="Tables">Tables</a>)
-        may now contain paragraphs.
-      </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.
-      </li>
-<li>
-<a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.cond" title="Conditional Generation">Conditional Generation</a>.
-        Ala 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.
-      </li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 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 http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="intro.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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>

Deleted: branches/proto/v4/tools/quickbook/doc/html/quickbook/editors.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/quickbook/editors.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,61 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Editor Support</title>
-<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Quickbook 1.4">
-<link rel="up" href="../index.html" title="Quickbook 1.4">
-<link rel="prev" href="install/linux.html" title="Debian, Ubuntu">
-<link rel="next" href="editors/scite.html" title="Scintilla Text Editor">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="install/linux.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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="editors/scite.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.editors"></a><a class="link" href="editors.html" title="Editor Support"> Editor Support</a>
-</h2></div></div></div>
-<div class="toc"><dl>
-<dt><span class="section"> Scintilla Text Editor</span></dt>
-<dt><span class="section">KDE Support</span></dt>
-</dl></div>
-<p>
-      Editing quickbook files is usually done with text editors both simple and powerful.
-      The following sections list the settings for some editors which can help make
-      editing quickbook files a bit easier.
-    </p>
-<div class="sidebar">
-<p class="title"><b></b></p>
-<p>
-      <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> You may submit your settings, tips, and suggestions to
-      the authors, or through the <a href="https://lists.sourceforge.net/lists/listinfo/boost-" target="_top">docs
-      Boost Docs mailing list</a>.
-    </p>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 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 http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="install/linux.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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="editors/scite.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/proto/v4/tools/quickbook/doc/html/quickbook/editors/kde_support.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/quickbook/editors/kde_support.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,465 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>KDE Support</title>
-<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../editors.html" title="Editor Support">
-<link rel="prev" href="scite.html" title="Scintilla Text Editor">
-<link rel="next" href="../faq.html" title="Frequently Asked Questions">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="scite.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../editors.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="../faq.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.editors.kde_support"></a><a class="link" href="kde_support.html" title="KDE Support">KDE Support</a>
-</h3></div></div></div>
-<a name="quickbook.editors.kde_support.boost__hs__quickbook"></a><h5>
-<a name="id4963116"></a>
-        <a class="link" href="kde_support.html#quickbook.editors.kde_support.boost__hs__quickbook">boost::hs::quickbook</a>
-      </h5>
-<p>
-        boost::hs::quickbook is a syntax highlighting designed to work with Katepart.
-        It can be used in KWrite, Kate, Konqueror and KDevelop, and supports all
-        the constructs of Quickbook 1.4 including tables, list, templates and macros.
-      </p>
-<div class="variablelist">
-<p class="title"><b></b></p>
-<dl>
-<dt><span class="term">.qbk loaded in a text editor</span></dt>
-<dd><p>
-            <span class="inlinemediaobject"><img src="../../images/extra/katepart/table.text.editor.png" alt="table.text.editor"></span>
-          </p></dd>
-<dt><span class="term">.qbk loaded with boost::hs support</span></dt>
-<dd><p>
-            <span class="inlinemediaobject"><img src="../../images/extra/katepart/table.boost.hs.png" alt="table.boost.hs"></span>
-          </p></dd>
-</dl>
-</div>
-<p>
-        <span class="bold"><strong>html generated from this .qbk file</strong></span>
-      </p>
-<div class="table">
-<a name="id4963207"></a><p class="title"><b>Table 7. Code examples</b></p>
-<div class="table-contents"><table class="table" summary="Code examples">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-            <p>
-              Name
-            </p>
-            </th>
-<th>
-            <p>
-              Code
-            </p>
-            </th>
-<th>
-            <p>
-              Description
-            </p>
-            </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-            <p>
-              for loop
-            </p>
-            </td>
-<td>
-            <p>
-              <code class="computeroutput"> <span class="keyword">for</span><span class="special">(</span><span class="identifier">int</span> <span class="identifier">k</span><span class="special">=</span><span class="number">0</span><span class="special">;</span>
-              <span class="identifier">k</span><span class="special">&lt;</span><span class="number">10</span><span class="special">;</span> <span class="identifier">k</span><span class="special">++)</span> <span class="identifier">v</span><span class="special">+=</span><span class="identifier">k</span><span class="special">;</span> </code>
-            </p>
-            </td>
-<td>
-            <p>
-              Sums some numbers.
-            </p>
-            </td>
-</tr>
-<tr>
-<td>
-            <p>
-              while loop
-            </p>
-            </td>
-<td>
-            <p>
-              <code class="computeroutput"> <span class="special">{</span> <span class="identifier">int</span>
-              <span class="identifier">k</span><span class="special">;</span>
-              <span class="keyword">while</span><span class="special">(</span>
-              <span class="identifier">k</span> <span class="special">&lt;</span>
-              <span class="number">10</span> <span class="special">)</span>
-              <span class="special">{</span> <span class="identifier">v</span><span class="special">+=</span><span class="identifier">k</span><span class="special">;</span> <span class="identifier">k</span><span class="special">++</span> <span class="special">}</span> <span class="special">}</span> </code>
-            </p>
-            </td>
-<td>
-            <p>
-              Same effect.
-            </p>
-            </td>
-</tr>
-<tr>
-<td>
-            <p>
-              infinite loop
-            </p>
-            </td>
-<td>
-            <p>
-              <code class="computeroutput"> <span class="keyword">while</span><span class="special">(</span>
-              <span class="identifier">true</span> <span class="special">)</span>
-              <span class="special">{</span> <span class="identifier">v</span><span class="special">+=</span><span class="number">1</span><span class="special">;</span>
-              <span class="special">}</span> </code>
-            </p>
-            </td>
-<td>
-            <p>
-              Not a good example.
-            </p>
-            </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><a name="quickbook.editors.kde_support.code_folding_"></a><h5>
-<a name="id4963573"></a>
-        <a class="link" href="kde_support.html#quickbook.editors.kde_support.code_folding_">Code Folding
-        </a>
-      </h5>
-<p>
-        boost::hs goes far beyond simple coloring. One useful thing you can get the
-        editor to do is to mark regions. They appear in a small grey line and each
-        region can be folded or unfolded independently.
-      </p>
-<a name="quickbook.editors.kde_support.auto_comment___uncomment_"></a><h5>
-<a name="id4963602"></a>
-        <a class="link" href="kde_support.html#quickbook.editors.kde_support.auto_comment___uncomment_">Auto
-        Comment / Uncomment </a>
-      </h5>
-<p>
-        Another important feature is the possibility to auto-comment or uncomment
-        some piece of code (<span class="emphasis"><em>Tools - Comment</em></span>). Commented regions
-        can be uncommented simple calling the <span class="emphasis"><em>uncomment</em></span> command
-        while being in it.
-      </p>
-<a name="quickbook.editors.kde_support.styles_reference_"></a><h5>
-<a name="id4963639"></a>
-        <a class="link" href="kde_support.html#quickbook.editors.kde_support.styles_reference_">Styles reference
-        </a>
-      </h5>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-              <p>
-                Name
-              </p>
-              </th>
-<th>
-              <p>
-                Style
-              </p>
-              </th>
-<th>
-              <p>
-                Description
-              </p>
-              </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-              <p>
-                <span class="bold"><strong>plain text</strong></span>
-              </p>
-              </td>
-<td>
-              <p>
-                normal black
-              </p>
-              </td>
-<td>
-              <p>
-                Plain text at each level.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <span class="bold"><strong>formatted text</strong></span>
-              </p>
-              </td>
-<td>
-              <p>
-                formatted black
-              </p>
-              </td>
-<td>
-              <p>
-                Bold, italic, underline and mixes. Teletype, replaceable, strikeout.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <span class="bold"><strong>structure</strong></span>
-              </p>
-              </td>
-<td>
-              <p>
-                light blue
-              </p>
-              </td>
-<td>
-              <p>
-                All quickbook structures characters ([, ], [block-type, simple formating
-                boundaries, lists keywords (*, #)
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <span class="bold"><strong>macros</strong></span>
-              </p>
-              </td>
-<td>
-              <p>
-                red
-              </p>
-              </td>
-<td>
-              <p>
-                Names in macro definitions, macros insertion if it is used the __xxx__
-                proposed sintaxis.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <span class="bold"><strong>templates</strong></span>
-              </p>
-              </td>
-<td>
-              <p>
-                red
-              </p>
-              </td>
-<td>
-              <p>
-                Names in template definitions
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <span class="bold"><strong>anchors</strong></span>
-              </p>
-              </td>
-<td>
-              <p>
-                red
-              </p>
-              </td>
-<td>
-              <p>
-                All the keywords that are used to link quickbooks together.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <span class="bold"><strong>comments</strong></span>
-              </p>
-              </td>
-<td>
-              <p>
-                italic light gray
-              </p>
-              </td>
-<td>
-              <p>
-                Inside the commentaries.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <span class="bold"><strong>tables</strong></span>
-              </p>
-              </td>
-<td>
-              <p>
-                HTML like
-              </p>
-              </td>
-<td>
-              <p>
-                Reveal the structure, bold title, higlighted HTML like columns titles.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <span class="bold"><strong>variable lists</strong></span>
-              </p>
-              </td>
-<td>
-              <p>
-                HTML like
-              </p>
-              </td>
-<td>
-              <p>
-                Reveal the structure, bold title, bold HTML like items names.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <span class="bold"><strong>c++ code</strong></span>
-              </p>
-              </td>
-<td>
-              <p>
-                cpp Kate syntax
-              </p>
-              </td>
-<td>
-              <p>
-                Code blocks and inline code.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <span class="bold"><strong>paths</strong></span>
-              </p>
-              </td>
-<td>
-              <p>
-                green
-              </p>
-              </td>
-<td>
-              <p>
-                Image, files and web paths
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <span class="bold"><strong>IDE specific</strong></span>
-              </p>
-              </td>
-<td>
-              <p>
-                dark blue
-              </p>
-              </td>
-<td>
-              <p>
-                IDE commands
-              </p>
-              </td>
-</tr>
-</tbody>
-</table></div>
-<a name="quickbook.editors.kde_support.about_boost__hs"></a><h5>
-<a name="id4964040"></a>
-        <a class="link" href="kde_support.html#quickbook.editors.kde_support.about_boost__hs">About boost::hs</a>
-      </h5>
-<p>
-        <span class="inlinemediaobject"><img src="../../images/extra/katepart/boost.hs.logo.png" alt="boost.hs.logo"></span>
-      </p>
-<p>
-        boost::hs::quickbook is a component of boost::hs, a syntax highlighting for
-        C++, doxygen, Boost.Build jamfiles and QuickBook. boost::hs has his own page
-        here.
-      </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" 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>
-          boost::hs::cpp support QuickBook code import comments style!
-        </p></td></tr>
-</table></div>
-<a name="quickbook.editors.kde_support.installing_boost__hs"></a><h5>
-<a name="id4964100"></a>
-        <a class="link" href="kde_support.html#quickbook.editors.kde_support.installing_boost__hs">Installing
-        boost::hs</a>
-      </h5>
-<p>
-        There exist an ongoing effort to push boost::hs upstream to the KatePart
-        project. In a few months KDE may have native Quickbook support! For the moment
-        you must download and install it.
-      </p>
-<p>
-        You can download boost::hs from here.
-      </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" 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>
-          A copy of boost::hs::quickbook and boost::hs::cpp is available in <code class="computeroutput"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">tools</span><span class="special">/</span><span class="identifier">quickbook</span><span class="special">/</span><span class="identifier">extra</span><span class="special">/</span><span class="identifier">katepart</span></code>.
-        </p></td></tr>
-</table></div>
-<p>
-        In order to install it you must copy the content in the folder <span class="bold"><strong>katepart/syntax/</strong></span> to the appropriate katepart syntax
-        folder in your machine. In general this folder will be in <span class="bold"><strong>/usr/share/apps/katepart/syntax</strong></span>.
-        A bash script named <span class="emphasis"><em>install.sh</em></span> is included that copy
-        the files to this folder.
-      </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 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 http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="scite.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../editors.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="../faq.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/proto/v4/tools/quickbook/doc/html/quickbook/editors/scite.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/quickbook/editors/scite.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,85 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Scintilla Text Editor</title>
-<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../editors.html" title="Editor Support">
-<link rel="prev" href="../editors.html" title="Editor Support">
-<link rel="next" href="kde_support.html" title="KDE Support">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../editors.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../editors.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="kde_support.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.editors.scite"></a><a class="link" href="scite.html" title="Scintilla Text Editor"> Scintilla Text Editor</a>
-</h3></div></div></div>
-<div class="blockquote"><blockquote class="blockquote">
-<p>
-          </p>
-<p>
-            <span class="emphasis"><em>Section contributed by Dean Michael Berris</em></span>
-          </p>
-<p>
-        </p>
-</blockquote></div>
-<p>
-        The Scintilla Text Editor (SciTE) is a free source code editor for Win32
-        and X. It uses the SCIntilla source code editing component.
-      </p>
-<div class="sidebar">
-<p class="title"><b></b></p>
-<p>
-        <span class="inlinemediaobject"><img src="../../images/tip.png" alt="tip"></span> SciTE can be downloaded from http://www.scintilla.org/SciTE.html
-      </p>
-</div>
-<p>
-        You can use the following settings to highlight quickbook tags when editing
-        quickbook files.
-      </p>
-<pre class="programlisting">qbk=*.qbk
-lexer.*.qbk=props
-use.tabs.$(qbk)=0
-tab.size.$(qbk)=4
-indent.size.$(qbk)=4
-style.props.32=$(font.base)
-comment.stream.start.props=[/
-comment.stream.end.props=]
-comment.box.start.props=[/
-comment.box.middle.props=
-comment.box.end.props=]
-</pre>
-<div class="sidebar">
-<p class="title"><b></b></p>
-<p>
-        <span class="inlinemediaobject"><img src="../../images/note.png" alt="note"></span> Thanks to Rene Rivera for the above SciTE settings.
-      </p>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 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 http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../editors.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../editors.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="kde_support.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/proto/v4/tools/quickbook/doc/html/quickbook/faq.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/quickbook/faq.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,100 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Frequently Asked Questions</title>
-<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Quickbook 1.4">
-<link rel="up" href="../index.html" title="Quickbook 1.4">
-<link rel="prev" href="editors/kde_support.html" title="KDE Support">
-<link rel="next" href="ref.html" title="Quick Reference">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="editors/kde_support.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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="ref.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.faq"></a><a class="link" href="faq.html" title="Frequently Asked Questions"> Frequently Asked Questions</a>
-</h2></div></div></div>
-<a name="quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_"></a><h4>
-<a name="id4964235"></a>
-      <a class="link" href="faq.html#quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_">Can
-      I use QuickBook for non-Boost documentation?</a>
-    </h4>
-<p>
-      QuickBook can be used for non-Boost documentation with a little extra work.
-    </p>
-<div class="blockquote"><blockquote class="blockquote">
-<p>
-        </p>
-<p>
-          <span class="emphasis"><em>Faq contributed by Michael Marcin</em></span>
-        </p>
-<p>
-      </p>
-</blockquote></div>
-<p>
-      When building HTML documentation with BoostBook a Boost C++ Libraries header
-      is added to the files. When using QuickBook to document projects outside of
-      Boost this is not desirable. This behavior can be overridden at the BoostBook
-      level by specifying some XSLT options. When using Boost Build version 2 (BBv2)
-      this can be achieved by adding parameters to the BoostBook target declaration.
-    </p>
-<p>
-      For example:
-    </p>
-<pre class="programlisting">using quickbook ;
-
-xml my_doc : my_doc.qbk ;
-
-boostbook standalone
-    :
-        my_doc
-    :
-        &lt;xsl:param&gt;boost.image.src<code class="literal">images/my_project_logo.png
-        &lt;xsl:param&gt;boost.image.alt</code>"\"My Project\""
-        &lt;xsl:param&gt;boost.image.w=100
-        &lt;xsl:param&gt;boost.image.h=50
-        &lt;xsl:param&gt;nav.layout=none
-    ;
-</pre>
-<a name="quickbook.faq.is_there_an_easy_way_to_convert_boostbook_docs_to_quickbook_"></a><h4>
-<a name="id4964312"></a>
-      <a class="link" href="faq.html#quickbook.faq.is_there_an_easy_way_to_convert_boostbook_docs_to_quickbook_">Is
-      there an easy way to convert BoostBook docs to QuickBook?</a>
-    </h4>
-<p>
-      There's a stylesheet that allows Boostbook generated HTML to be viewed as quickbook
-      source, see http://svn.boost.org/trac/boost/wiki/QuickbookSourceStylesheetProject,
-      so it's then just a cut and paste job to convert the BoostBook to QuickBook
-      (which IMO is a whole lot easier to edit and maintain).
-    </p>
-<p>
-      --John Maddock
-    </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 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 http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="editors/kde_support.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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="ref.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/proto/v4/tools/quickbook/doc/html/quickbook/install.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/quickbook/install.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,60 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Installation and configuration</title>
-<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Quickbook 1.4">
-<link rel="up" href="../index.html" title="Quickbook 1.4">
-<link rel="prev" href="syntax/block.html" title="Block Level Elements">
-<link rel="next" href="install/macosx.html" title="Mac OS X">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="syntax/block.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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="install/macosx.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.install"></a><a class="link" href="install.html" title="Installation and configuration"> Installation and configuration</a>
-</h2></div></div></div>
-<div class="toc"><dl>
-<dt><span class="section"> Mac OS X</span></dt>
-<dt><span class="section"> Windows 2000, XP, 2003, Vista</span></dt>
-<dt><span class="section"> Debian, Ubuntu</span></dt>
-</dl></div>
-<p>
-      This section provides some guidelines on how to install and configure BoostBook
-      and Quickbook under several operating systems.
-    </p>
-<p>
-      Before continuing, it is very important that you keep this in mind: if you
-      try to build some documents and the process breaks due to misconfiguration,
-      be absolutely sure to delete any <code class="computeroutput"><span class="identifier">bin</span></code>
-      and <code class="computeroutput"><span class="identifier">bin</span><span class="special">.</span><span class="identifier">v2</span></code> directories generated by the build before
-      trying again. Otherwise your configuration fixes will not take any effect.
-    </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 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 http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="syntax/block.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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="install/macosx.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/proto/v4/tools/quickbook/doc/html/quickbook/install/linux.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/quickbook/install/linux.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,104 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Debian, Ubuntu</title>
-<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../install.html" title="Installation and configuration">
-<link rel="prev" href="windows.html" title="Windows 2000, XP, 2003, Vista">
-<link rel="next" href="../editors.html" title="Editor Support">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="windows.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../install.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="../editors.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.install.linux"></a><a class="link" href="linux.html" title="Debian, Ubuntu"> Debian, Ubuntu</a>
-</h3></div></div></div>
-<p>
-        The following instructions apply to Debian and its derivatives. They are
-        based on a Ubuntu Edgy install but should work on other Debian based systems.
-      </p>
-<p>
-        First install the <code class="computeroutput"><span class="identifier">bjam</span></code>,
-        <code class="computeroutput"><span class="identifier">xsltproc</span></code>, <code class="computeroutput"><span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xsl</span></code> and
-        <code class="computeroutput"><span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xml</span></code> packages. For example, using <code class="computeroutput"><span class="identifier">apt</span><span class="special">-</span><span class="identifier">get</span></code>:
-      </p>
-<pre class="programlisting"><span class="identifier">sudo</span> <span class="identifier">apt</span><span class="special">-</span><span class="identifier">get</span> <span class="identifier">install</span> <span class="identifier">xsltproc</span> <span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xsl</span> <span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xml</span>
-</pre>
-<p>
-        If you're planning on building boost's documentation, you'll also need to
-        install the <code class="computeroutput"><span class="identifier">doxygen</span></code> package
-        as well.
-      </p>
-<p>
-        Next, we need to configure Boost Build to compile BoostBook files. Add the
-        following to your <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code> file, which should be in your home
-        directory. If you don't have one, create a file containing this text. For
-        more information on setting up <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code>, see
-        the <a href="http://boost.org/boost-build2/doc/html/bbv2/advanced/configuration.html" target="_top">Boost
-        Build documentation</a>.
-      </p>
-<pre class="programlisting"><span class="identifier">using</span> <span class="identifier">xsltproc</span> <span class="special">;</span>
-
-<span class="identifier">using</span> <span class="identifier">boostbook</span>
-    <span class="special">:</span> <span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">share</span><span class="special">/</span><span class="identifier">xml</span><span class="special">/</span><span class="identifier">docbook</span><span class="special">/</span><span class="identifier">stylesheet</span><span class="special">/</span><span class="identifier">nwalsh</span>
-    <span class="special">:</span> <span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">share</span><span class="special">/</span><span class="identifier">xml</span><span class="special">/</span><span class="identifier">docbook</span><span class="special">/</span><span class="identifier">schema</span><span class="special">/</span><span class="identifier">dtd</span><span class="special">/</span><span class="number">4.2</span>
-    <span class="special">;</span>
-
-<span class="comment"># Remove this line if you're not using doxygen
-</span><span class="identifier">using</span> <span class="identifier">doxygen</span> <span class="special">;</span>
-</pre>
-<p>
-        The above steps are enough to get a functional BoostBook setup. Quickbook
-        will be automatically built when needed. If you want to avoid these rebuilds:
-      </p>
-<div class="orderedlist"><ol type="1">
-<li>
-          Go to Quickbook's source directory (<code class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">/</span><span class="identifier">tools</span><span class="special">/</span><span class="identifier">quickbook</span></code>).
-        </li>
-<li>
-          Build the utility by issuing <code class="computeroutput"><span class="identifier">bjam</span>
-          <span class="special">--</span><span class="identifier">v2</span></code>.
-        </li>
-<li>
-          Copy the resulting <code class="computeroutput"><span class="identifier">quickbook</span></code>
-          binary (located under the <code class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">/</span><span class="identifier">bin</span><span class="special">.</span><span class="identifier">v2</span></code> hierarchy)
-          to a safe place. The traditional location is <code class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span><span class="special">/</span><span class="identifier">bin</span></code>.
-        </li>
-<li>
-          Add the following to your <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code>
-          file, using the full path of the quickbook executable:
-        </li>
-</ol></div>
-<pre class="programlisting"><span class="identifier">using</span> <span class="identifier">quickbook</span>
-    <span class="special">:</span> <span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span><span class="special">/</span><span class="identifier">bin</span><span class="special">/</span><span class="identifier">quickbook</span>
-    <span class="special">;</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 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 http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="windows.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../install.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="../editors.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/proto/v4/tools/quickbook/doc/html/quickbook/install/macosx.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/quickbook/install/macosx.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,156 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Mac OS X</title>
-<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../install.html" title="Installation and configuration">
-<link rel="prev" href="../install.html" title="Installation and configuration">
-<link rel="next" href="windows.html" title="Windows 2000, XP, 2003, Vista">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../install.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../install.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="windows.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.install.macosx"></a><a class="link" href="macosx.html" title="Mac OS X"> Mac OS X</a>
-</h3></div></div></div>
-<div class="blockquote"><blockquote class="blockquote">
-<p>
-          </p>
-<p>
-            <span class="emphasis"><em>Section contributed by Julio M. Merino Vidal</em></span>
-          </p>
-<p>
-        </p>
-</blockquote></div>
-<p>
-        The following instructions explain how to install Docbook XML, Docbook XSL
-        and Doxygen in a Mac OS X system, how to configure Boost.Build v2 to recognize
-        them and how to build and install Quickbook. They were taken from a 10.4
-        (Tiger) machine so it is likely that they also apply to future versions;
-        they may not work with older ones, though.
-      </p>
-<p>
-        The text below assumes you want to install all the necessary utilities in
-        a system-wide location, allowing any user in the machine to have access to
-        them. Therefore, all files will be put in the <code class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span></code>
-        hierarchy. If you do not want this, you can choose any other prefix such
-        as <code class="computeroutput"><span class="special">~/</span><span class="identifier">Applications</span></code>
-        for a single-user installation.
-      </p>
-<p>
-        Mac OS X comes with <code class="computeroutput"><span class="identifier">xsltproc</span></code>
-        and all related libraries preinstalled, so you do not need to take any extra
-        steps to set them up. It is probable that future versions will include them
-        too, but these instructions may not apply to older versions.
-      </p>
-<p>
-        To get started:
-      </p>
-<div class="orderedlist"><ol type="1">
-<li>
-          Download <a href="http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip" target="_top">Docbook
-          XML 4.2</a> and unpack it inside <code class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span><span class="special">/</span><span class="identifier">share</span><span class="special">/</span><span class="identifier">xml</span><span class="special">/</span><span class="identifier">docbook</span><span class="special">/</span><span class="number">4.2</span></code>.
-        </li>
-<li>
-          Download the latest <a href="http://sourceforge.net/project/showfiles.php?group_id=21935&amp;package_id=16608" target="_top">Docbook
-          XSL</a> version and unpack it. Put the results in <code class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span><span class="special">/</span><span class="identifier">share</span><span class="special">/</span><span class="identifier">xsl</span><span class="special">/</span><span class="identifier">docbook</span></code>, thus effectively removing the
-          version number from the directory name (for simplicity).
-        </li>
-<li>
-          Add the following to your <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code>
-          file, which should live in your home directory (<code class="computeroutput"><span class="special">/</span><span class="identifier">Users</span><span class="special">/&lt;</span><span class="identifier">your_username</span><span class="special">&gt;</span></code>).
-          You must already have it somewhere or otherwise you could not be building
-          Boost (i.e. missing tools configuration).
-        </li>
-</ol></div>
-<pre class="programlisting"><span class="keyword">using</span> <span class="identifier">xsltproc</span> <span class="special">;</span>
-
-<span class="keyword">using</span> <span class="identifier">boostbook</span>
-    <span class="special">:</span> <span class="string">"/usr/local/share/xsl/docbook"</span>
-    <span class="special">:</span> <span class="string">"/usr/local/share/xml/docbook/4.2"</span>
-    <span class="special">;</span>
-</pre>
-<p>
-        The above steps are enough to get a functional BoostBook setup. Quickbook
-        will be automatically built when needed. If you want to avoid these rebuilds
-        and install a system-wide Quickbook instead:
-      </p>
-<div class="orderedlist"><ol type="1">
-<li>
-          Go to Quickbook's source directory (<code class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">/</span><span class="identifier">tools</span><span class="special">/</span><span class="identifier">quickbook</span></code>).
-        </li>
-<li>
-          Build the utility by issuing <code class="computeroutput"><span class="identifier">bjam</span>
-          <span class="special">--</span><span class="identifier">v2</span></code>.
-        </li>
-<li>
-          Copy the resulting <code class="computeroutput"><span class="identifier">quickbook</span></code>
-          binary (located under the <code class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">/</span><span class="identifier">bin</span><span class="special">.</span><span class="identifier">v2</span></code> hierarchy)
-          to a safe place. Following our previous example, you can install it into:
-          <code class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span><span class="special">/</span><span class="identifier">bin</span></code>.
-        </li>
-<li>
-          Add the following to your <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code>
-          file:
-        </li>
-</ol></div>
-<pre class="programlisting"><span class="keyword">using</span> <span class="identifier">quickbook</span>
-    <span class="special">:</span> <span class="string">"/usr/local/bin/quickbook"</span> <span class="special">;</span>
-    <span class="special">;</span>
-</pre>
-<p>
-        Additionally, if you need to build documentation that uses Doxygen,
-        you will need to install it too:
-      </p>
-<div class="orderedlist"><ol type="1">
-<li>
-          Go to the <a href="http://www.stack.nl/~dimitri/doxygen/download.html#latestsrc" target="_top">downloads
-          section</a> and get the disk image (<code class="computeroutput"><span class="identifier">dmg</span></code>
-          file) for Mac OS X.
-        </li>
-<li>
-          Open the disk image and drag the Doxygen application to your <code class="computeroutput"><span class="identifier">Applications</span></code> folder to install it.
-        </li>
-<li>
-          Add the following to your <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code>
-          file:
-        </li>
-</ol></div>
-<pre class="programlisting"><span class="keyword">using</span> <span class="identifier">doxygen</span>
-    <span class="special">:</span> <span class="special">/</span><span class="identifier">Applications</span><span class="special">/</span><span class="identifier">Doxygen</span><span class="special">.</span><span class="identifier">app</span><span class="special">/</span><span class="identifier">Contents</span><span class="special">/</span><span class="identifier">Resources</span><span class="special">/</span><span class="identifier">doxygen</span>
-    <span class="special">;</span>
-</pre>
-<p>
-        Alternatively, you may want to install all the prerequistes through a package
-        system to avoid manual management of the installations. In that case, check
-        out pkgsrc.
-      </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 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 http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../install.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../install.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="windows.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/proto/v4/tools/quickbook/doc/html/quickbook/install/windows.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/quickbook/install/windows.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,136 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Windows 2000, XP, 2003, Vista</title>
-<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../install.html" title="Installation and configuration">
-<link rel="prev" href="macosx.html" title="Mac OS X">
-<link rel="next" href="linux.html" title="Debian, Ubuntu">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="macosx.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../install.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="linux.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.install.windows"></a><a class="link" href="windows.html" title="Windows 2000, XP, 2003, Vista"> Windows 2000, XP, 2003, Vista</a>
-</h3></div></div></div>
-<p>
-      </p>
-<div class="blockquote"><blockquote class="blockquote">
-<p>
-          </p>
-<p>
-            <span class="emphasis"><em>Section contributed by Julio M. Merino Vidal</em></span>
-          </p>
-<p>
-        </p>
-</blockquote></div>
-<p>
-        The following instructions apply to any Windows system based on Windows 2000,
-        including Windows XP, Windows 2003 Server and Windows Vista. The paths shown
-        below are taken from a Windows Vista machine; you will need to adjust them
-        to match your system in case you are running an older version.
-      </p>
-<div class="orderedlist"><ol type="1">
-<li>
-          First of all you need to have a copy of <code class="computeroutput"><span class="identifier">xsltproc</span></code>
-          for Windows. There are many ways to get this tool, but to keep things simple,
-          use the binary packages
-          made by Igor Zlatkovic. At the very least, you need to download the following
-          packages: <code class="computeroutput"><span class="identifier">iconv</span></code>, <code class="computeroutput"><span class="identifier">zlib</span></code>, <code class="computeroutput"><span class="identifier">libxml2</span></code>
-          and <code class="computeroutput"><span class="identifier">libxslt</span></code>.
-        </li>
-<li>
-          Unpack all these packages in the same directory so that you get unique
-          <code class="computeroutput"><span class="identifier">bin</span></code>, <code class="computeroutput"><span class="identifier">include</span></code>
-          and <code class="computeroutput"><span class="identifier">lib</span></code> directories within
-          the hierarchy. These instructions use <code class="computeroutput"><span class="identifier">C</span><span class="special">:\</span><span class="identifier">Users</span><span class="special">\</span><span class="identifier">example</span><span class="special">\</span><span class="identifier">Documents</span><span class="special">\</span><span class="identifier">boost</span><span class="special">\</span><span class="identifier">xml</span></code>
-          as the root for all files.
-        </li>
-<li>
-          From the command line, go to the <code class="computeroutput"><span class="identifier">bin</span></code>
-          directory and launch <code class="computeroutput"><span class="identifier">xsltproc</span><span class="special">.</span><span class="identifier">exe</span></code>
-          to ensure it works. You should get usage information on screen.
-        </li>
-<li>
-          Download <a href="http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip" target="_top">Docbook
-          XML 4.2</a> and unpack it in the same directory used above. That is:
-          <code class="computeroutput"><span class="identifier">C</span><span class="special">:\</span><span class="identifier">Users</span><span class="special">\</span><span class="identifier">example</span><span class="special">\</span><span class="identifier">Documents</span><span class="special">\</span><span class="identifier">boost</span><span class="special">\</span><span class="identifier">xml</span><span class="special">\</span><span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xml</span></code>.
-        </li>
-<li>
-          Download the latest <a href="http://sourceforge.net/project/showfiles.php?group_id=21935&amp;package_id=16608" target="_top">Docbook
-          XSL</a> version and unpack it, again in the same directory used before.
-          To make things easier, rename the directory created during the extraction
-          to <code class="computeroutput"><span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xsl</span></code> (bypassing the version name): <code class="computeroutput"><span class="identifier">C</span><span class="special">:\</span><span class="identifier">Users</span><span class="special">\</span><span class="identifier">example</span><span class="special">\</span><span class="identifier">Documents</span><span class="special">\</span><span class="identifier">boost</span><span class="special">\</span><span class="identifier">xml</span><span class="special">\</span><span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xsl</span></code>.
-        </li>
-<li>
-          Add the following to your <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code>
-          file, which should live in your home directory (<code class="computeroutput"><span class="special">%</span><span class="identifier">HOMEDRIVE</span><span class="special">%%</span><span class="identifier">HOMEPATH</span><span class="special">%</span></code>).
-          You must already have it somewhere or otherwise you could not be building
-          Boost (i.e. missing tools configuration).
-        </li>
-</ol></div>
-<pre class="programlisting"><span class="identifier">using</span> <span class="identifier">xsltproc</span>
-    <span class="special">:</span> <span class="string">"C:/Users/example/Documents/boost/xml/bin/xsltproc.exe"</span>
-    <span class="special">;</span>
-
-<span class="identifier">using</span> <span class="identifier">boostbook</span>
-    <span class="special">:</span> <span class="string">"C:/Users/example/Documents/boost/xml/docbook-xsl"</span>
-    <span class="special">:</span> <span class="string">"C:/Users/example/Documents/boost/xml/docbook-xml"</span>
-    <span class="special">;</span>
-</pre>
-<p>
-        The above steps are enough to get a functional BoostBook setup. Quickbook
-        will be automatically built when needed. If you want to avoid these rebuilds:
-      </p>
-<div class="orderedlist"><ol type="1">
-<li>
-          Go to Quickbook's source directory (<code class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">\</span><span class="identifier">tools</span><span class="special">\</span><span class="identifier">quickbook</span></code>).
-        </li>
-<li>
-          Build the utility by issuing <code class="computeroutput"><span class="identifier">bjam</span>
-          <span class="special">--</span><span class="identifier">v2</span></code>.
-        </li>
-<li>
-          Copy the resulting <code class="computeroutput"><span class="identifier">quickbook</span><span class="special">.</span><span class="identifier">exe</span></code>
-          binary (located under the <code class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">\</span><span class="identifier">bin</span><span class="special">.</span><span class="identifier">v2</span></code> hierarchy)
-          to a safe place. Following our previous example, you can install it into:
-          <code class="computeroutput"><span class="identifier">C</span><span class="special">:\</span><span class="identifier">Users</span><span class="special">\</span><span class="identifier">example</span><span class="special">\</span><span class="identifier">Documents</span><span class="special">\</span><span class="identifier">boost</span><span class="special">\</span><span class="identifier">xml</span><span class="special">\</span><span class="identifier">bin</span></code>.
-        </li>
-<li>
-          Add the following to your <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code>
-          file:
-        </li>
-</ol></div>
-<pre class="programlisting"><span class="identifier">using</span> <span class="identifier">quickbook</span>
-    <span class="special">:</span> <span class="string">"C:/Users/example/Documents/boost/xml/bin/quickbook.exe"</span>
-    <span class="special">;</span>
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 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 http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="macosx.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../install.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="linux.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/proto/v4/tools/quickbook/doc/html/quickbook/intro.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/quickbook/intro.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,115 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Introduction</title>
-<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Quickbook 1.4">
-<link rel="up" href="../index.html" title="Quickbook 1.4">
-<link rel="prev" href="../index.html" title="Quickbook 1.4">
-<link rel="next" href="change_log.html" title="Change Log">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../index.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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="change_log.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.intro"></a><a class="link" href="intro.html" title="Introduction"> Introduction</a>
-</h2></div></div></div>
-<div class="blockquote"><blockquote class="blockquote">
-<p>
-        </p>
-<p>
-          <span class="bold"><strong><span class="emphasis"><em>&#8220;<span class="quote">Why program by hand in five days
-          what you can spend five years of your life automating?</span>&#8221;</em></span></strong></span>
-        </p>
-<p>
-        </p>
-<p>
-          -- Terrence Parr, author ANTLR/PCCTS
-        </p>
-<p>
-      </p>
-</blockquote></div>
-<p>
-      Well, QuickBook started as a weekend hack. It was originally intended to be
-      a sample application using Spirit.
-      What is it? What you are viewing now, this documentation, is autogenerated
-      by QuickBook. These files were generated from one master:
-    </p>
-<div class="blockquote"><blockquote class="blockquote">
-<p>
-        </p>
-<p>
-          quickbook.qbk
-        </p>
-<p>
-      </p>
-</blockquote></div>
-<p>
-      Originally named QuickDoc, this funky tool that never dies, evolved into a
-      funkier tool thanks to Eric Niebler who resurrected the project making it generate
-      BoostBook
-      instead of HTML. The BoostBook
-      documentation format is an extension of DocBook,
-      an SGML or XML based format for describing documentation.
-    </p>
-<p>
-      QuickBook is a WikiWiki style documentation tool geared towards C++ documentation
-      using simple rules and markup for simple formatting tasks. QuickBook extends
-      the WikiWiki concept. Like the WikiWiki, QuickBook documents are simple text
-      files. A single QuickBook document can generate a fully linked set of nice
-      HTML and PostScript/PDF documents complete with images and syntax- colorized
-      source code.
-    </p>
-<p>
-      Features include:
-    </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-        generate BoostBook
-        xml, to generate HTML, PostScript and PDF
-      </li>
-<li>
-        simple markup to link to Doxygen-generated entities
-      </li>
-<li>
-        macro system for simple text substitution
-      </li>
-<li>
-        simple markup for italics, bold, preformatted, blurbs, code samples, tables,
-        URLs, anchors, images, etc.
-      </li>
-<li>
-        automatic syntax coloring of code samples
-      </li>
-<li>
-        CSS support
-      </li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 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 http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../index.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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="change_log.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/proto/v4/tools/quickbook/doc/html/quickbook/ref.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/quickbook/ref.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,958 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Quick Reference</title>
-<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Quickbook 1.4">
-<link rel="up" href="../index.html" title="Quickbook 1.4">
-<link rel="prev" href="faq.html" title="Frequently Asked Questions">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="faq.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="quickbook.ref"></a><a class="link" href="ref.html" title="Quick Reference"> Quick Reference</a>
-</h2></div></div></div>
-<p>
-    </p>
-<div class="table">
-<a name="id4964367"></a><p class="title"><b>Table 8. Syntax Compendium</b></p>
-<div class="table-contents"><table class="table" summary="Syntax Compendium">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-          <p>
-            To do this...
-          </p>
-          </th>
-<th>
-          <p>
-            Use this...
-          </p>
-          </th>
-<th>
-          <p>
-            See this...
-          </p>
-          </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-          <p>
-            comment
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[/ some comment]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/comments.html" title="Comments">Comments</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            <span class="emphasis"><em>italics</em></span>
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">['italics] or /italics/</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.font_styles" title="Font Styles">Font Styles</a>
-            and <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple
-            formatting</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            <span class="bold"><strong>bold</strong></span>
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[*bold] or *bold*</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.font_styles" title="Font Styles">Font Styles</a>
-            and <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple
-            formatting</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            <span class="underline">underline</span>
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[_underline] or _underline_</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.font_styles" title="Font Styles">Font Styles</a>
-            and <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple
-            formatting</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            <code class="literal">teletype</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[^teletype] or =teletype=</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.font_styles" title="Font Styles">Font Styles</a>
-            and <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple
-            formatting</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            <span class="strikethrough">strikethrough</span>
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[-strikethrough]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.font_styles" title="Font Styles">Font Styles</a>
-            and <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple
-            formatting</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            <em class="replaceable"><code>
-              replaceable
-            </code></em>
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[~replaceable]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.replaceable" title="Replaceable">Replaceble</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            source mode
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[c++]</code> or <code class="literal">[python]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.source_mode" title="Source Mode">Source Mode</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            inline code
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">`int main();`</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.inline_code" title="Inline code">Inline code</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            code block
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">``int main();``</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.code" title="Code">Code</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            code escape
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">``from c++ to QuickBook``</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.escape_back" title="Escaping Back To QuickBook">Escaping Back To QuickBook</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            line break
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[br] or \n</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.line_break" title="line-break">line-break</a>
-            <span class="bold"><strong>DEPRECATED</strong></span>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            anchor
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[#anchor]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.anchors" title="Anchors">Anchors</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            link
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[@http://www.boost.org Boost]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.links" title="Links">Links</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            anchor link
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[link section.anchor Link text]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.anchor_links" title="Anchor links">Anchor links</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            refentry link
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[link xml.refentry Link text]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.refentry_links" title="refentry links">refentry links</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            function link
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[funcref fully::qualified::function_name Link text]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title="Code Links">function, class, member,
-            enum, macro, concept or header links</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            class link
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[classref fully::qualified::class_name Link text]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title="Code Links">function, class, member,
-            enum, macro, concept or header links</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            member link
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[memberref fully::qualified::member_name Link text]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title="Code Links">function, class, member,
-            enum, macro, concept or header links</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            enum link
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[enumref fully::qualified::enum_name Link text]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title="Code Links">function, class, member,
-            enum, macro, concept or header links</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            macro link
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[macroref MACRO_NAME Link text]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title="Code Links">function, class, member,
-            enum, macro, concept or header links</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            concept link
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[conceptref ConceptName Link text]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title="Code Links">function, class, member,
-            enum, macro, concept or header links</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            header link
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[headerref path/to/header.hpp Link text]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title="Code Links">function, class, member,
-            enum, macro, concept or header links</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            global link
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[globalref fully::qualified::global Link text]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title="Code Links">function, class, member,
-            enum, macro, concept or header links</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            escape
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">'''escaped text (no processing/formatting)'''</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.escape" title="Escape">Escape</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            single char escape
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">\c</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.single_char_escape" title="Single char escape">Single char
-            escape</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            images
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[$image.jpg]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.images" title="Images">Images</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            begin section
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[section The Section Title]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.section" title="Section">Section</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            end section
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[endsect]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.section" title="Section">Section</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            paragraph
-          </p>
-          </td>
-<td>
-          <p>
-            No markup. Paragraphs start left-flushed and are terminated by two or
-            more newlines.
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.paragraphs" title="Paragraphs">Paragraphs</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            ordered list
-          </p>
-          </td>
-<td>
-          <p>
-            
-</p>
-<pre class="programlisting"># one
-# two
-# three
-</pre>
-<p>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.lists.ordered_lists" title="Ordered lists">Ordered lists</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            unordered list
-          </p>
-          </td>
-<td>
-          <p>
-            
-</p>
-<pre class="programlisting">* one
-* two
-* three
-</pre>
-<p>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.lists.unordered_lists" title="Unordered lists">Unordered
-            lists</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            code
-          </p>
-          </td>
-<td>
-          <p>
-            No markup. Preformatted code starts with a space or a tab.
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.code" title="Code">Code</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            preformatted
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[pre preformatted]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.preformatted" title="Preformatted">Preformatted</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            block quote
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[:sometext...]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.blockquote" title="Blockquote">Blockquote</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            heading 1
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[h1 Heading 1]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.headings" title="Headings">Heading</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            heading 2
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[h2 Heading 2]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.headings" title="Headings">Heading</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            heading 3
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[h3 Heading 3]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.headings" title="Headings">Heading</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            heading 4
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[h4 Heading 4]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.headings" title="Headings">Heading</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            heading 5
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[h5 Heading 5]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.headings" title="Headings">Heading</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            heading 6
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[h6 Heading 6]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.headings" title="Headings">Heading</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            macro
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[def macro_identifier some text]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.macros" title="Macros">Macros</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            template
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[template[a b] [a] body [b]]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.templates" title="Templates">Templates</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            blurb
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[blurb advertisement or note...]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.blurbs" title="Blurbs">Blurbs</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            admonition
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[warning Warning text...]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.admonitions" title="Admonitions">Admonitions</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            table
-          </p>
-          </td>
-<td>
-          <p>
-            
-</p>
-<pre class="programlisting">[table Title
-[[a][b][c]]
-[[a][b][c]]
-]
-</pre>
-<p>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.tables" title="Tables">Tables</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            variablelist
-          </p>
-          </td>
-<td>
-          <p>
-            
-</p>
-<pre class="programlisting">[variablelist Title
-[[a][b]]
-[[a][b]]
-]
-</pre>
-<p>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.variable_lists" title="Variable Lists">Variable Lists</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            include
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[include someother.qbk]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/block.html#quickbook.syntax.block.include" title="Include">Include</a>
-          </p>
-          </td>
-</tr>
-<tr>
-<td>
-          <p>
-            conditional generation
-          </p>
-          </td>
-<td>
-          <p>
-            <code class="literal">[? symbol phrase]</code>
-          </p>
-          </td>
-<td>
-          <p>
-            <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.cond" title="Conditional Generation">Conditional Generation</a>
-          </p>
-          </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break">
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 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 http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="faq.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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>
-</div>
-</body>
-</html>

Deleted: branches/proto/v4/tools/quickbook/doc/html/quickbook/syntax.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/quickbook/syntax.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,64 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Syntax Summary</title>
-<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Quickbook 1.4">
-<link rel="up" href="../index.html" title="Quickbook 1.4">
-<link rel="prev" href="change_log.html" title="Change Log">
-<link rel="next" href="syntax/comments.html" title="Comments">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="change_log.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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/comments.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.syntax"></a><a class="link" href="syntax.html" title="Syntax Summary"> Syntax Summary</a>
-</h2></div></div></div>
-<div class="toc"><dl>
-<dt><span class="section">Comments</span></dt>
-<dt><span class="section"> Phrase Level Elements</span></dt>
-<dt><span class="section"> Block Level Elements</span></dt>
-</dl></div>
-<p>
-      A QuickBook document is composed of one or more blocks. An example of a block
-      is the paragraph or a C++ code snippet. Some blocks have special mark-ups.
-      Blocks, except code snippets which have their own grammar (C++ or Python),
-      are composed of one or more phrases. A phrase can be a simple contiguous run
-      of characters. Phrases can have special mark-ups. Marked up phrases can recursively
-      contain other phrases, but cannot contain blocks. A terminal is a self contained
-      block-level or phrase-level element that does not nest anything.
-    </p>
-<p>
-      Blocks, in general, are delimited by two end-of-lines (the block terminator).
-      Phrases in each block cannot contain a block terminator. This way, syntax errors
-      such as un-matched closing brackets do not go haywire and corrupt anything
-      past a single block.
-    </p>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 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 http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="change_log.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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/comments.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/proto/v4/tools/quickbook/doc/html/quickbook/syntax/block.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/quickbook/syntax/block.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,1895 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Block Level Elements</title>
-<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../syntax.html" title="Syntax Summary">
-<link rel="prev" href="phrase.html" title="Phrase Level Elements">
-<link rel="next" href="../install.html" title="Installation and configuration">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="phrase.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.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="../install.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.syntax.block"></a><a class="link" href="block.html" title="Block Level Elements"> Block Level Elements</a>
-</h3></div></div></div>
-<div class="toc"><dl>
-<dt><span class="section">Document</span></dt>
-<dt><span class="section">Section</span></dt>
-<dt><span class="section">xinclude</span></dt>
-<dt><span class="section">Paragraphs</span></dt>
-<dt><span class="section">Lists</span></dt>
-<dt><span class="section">Code</span></dt>
-<dt><span class="section"><a href="block.html#quickbook.syntax.block.escape_back"> Escaping Back
-        To QuickBook</a></span></dt>
-<dt><span class="section">Preformatted</span></dt>
-<dt><span class="section">Blockquote</span></dt>
-<dt><span class="section">Admonitions</span></dt>
-<dt><span class="section">Headings</span></dt>
-<dt><span class="section">Generic Heading</span></dt>
-<dt><span class="section">Macros</span></dt>
-<dt><span class="section"><a href="block.html#quickbook.syntax.block.predefined_macros">Predefined
-        Macros</a></span></dt>
-<dt><span class="section">Templates</span></dt>
-<dt><span class="section">Blurbs</span></dt>
-<dt><span class="section">Tables</span></dt>
-<dt><span class="section">Variable Lists</span></dt>
-<dt><span class="section">Include</span></dt>
-<dt><span class="section">Import</span></dt>
-</dl></div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.document"></a><a class="link" href="block.html#quickbook.syntax.block.document" title="Document">Document</a>
-</h4></div></div></div>
-<p>
-          Every document must begin with a Document Info section, which should look
-          like this:
-        </p>
-<pre class="programlisting">[document-type The Document Title
-    [quickbook 1.3]
-    [version 1.0]
-    [id the_document_name]
-    [dirname the_document_dir]
-    [copyright 2000 2002 2003 Joe Blow, Jane Doe]
-    [purpose The document's reason for being]
-    [category The document's category]
-    [authors [Blow, Joe], [Doe, Jane]]
-    [license The document's license]
-    [source-mode source-type]
-]
-</pre>
-<p>
-          Where document-type is one of:
-        </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-            book
-          </li>
-<li>
-            article
-          </li>
-<li>
-            library
-          </li>
-<li>
-            chapter
-          </li>
-<li>
-            part
-          </li>
-<li>
-            appendix
-          </li>
-<li>
-            preface
-          </li>
-<li>
-            qandadiv
-          </li>
-<li>
-            qandaset
-          </li>
-<li>
-            reference
-          </li>
-<li>
-            set
-          </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.
-        </p>
-<p>
-          <code class="literal">version</code>, <code class="literal">id</code>, <code class="literal">dirname</code>,
-          <code class="literal">copyright</code>, <code class="literal">purpose</code>, <code class="literal">category</code>,
-          <code class="literal">authors</code>, <code class="literal">license</code>, <code class="literal">last-revision</code>
-          and <code class="literal">source-mode</code> are optional information.
-        </p>
-<p>
-          <code class="literal">source-type</code> is a lowercase string setting the initial
-          <a class="link" href="phrase.html#quickbook.syntax.phrase.source_mode" title="Source Mode">Source Mode</a>.
-          If the <code class="literal">source-mode</code> field is omitted, a default value
-          of <code class="literal">c++</code> will be used.
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.section"></a><a class="link" href="block.html#quickbook.syntax.block.section" title="Section">Section</a>
-</h4></div></div></div>
-<p>
-          Starting a new section is accomplished with:
-        </p>
-<pre class="programlisting">[section:id The Section Title]
-</pre>
-<p>
-          where <span class="emphasis"><em>id</em></span> is optional. id will be the filename of the
-          generated section. If it is not present, "The Section Title"
-          will be normalized and become the id. Valid characters are <code class="literal">a-Z</code>,
-          <code class="literal">A-Z</code>, <code class="literal">0-9</code> and <code class="literal">_</code>.
-          All non-valid characters are converted to underscore and all upper-case
-          are converted to lower case. Thus: "The Section Title" will be
-          normalized to "the_section_title".
-        </p>
-<p>
-          End a section with:
-        </p>
-<pre class="programlisting">[endsect]
-</pre>
-<p>
-          Sections can nest, and that results in a hierarchy in the table of contents.
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.xinclude"></a><a class="link" href="block.html#quickbook.syntax.block.xinclude" title="xinclude">xinclude</a>
-</h4></div></div></div>
-<p>
-          You can include another XML file with:
-        </p>
-<pre class="programlisting">[xinclude file.xml]
-</pre>
-<p>
-          This is useful when file.xml has been generated by Doxygen and contains
-          your reference section.
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.paragraphs"></a><a class="link" href="block.html#quickbook.syntax.block.paragraphs" title="Paragraphs">Paragraphs</a>
-</h4></div></div></div>
-<p>
-          Paragraphs start left-flushed and are terminated by two or more newlines.
-          No markup is needed for paragraphs. QuickBook automatically detects paragraphs
-          from the context. Block markups [section, endsect, h1, h2, h3, h4, h5,
-          h6, blurb, (block-quote) ':', pre, def, table and include ] may also terminate
-          a paragraph.
-        </p>
-<p>
-          This is a new paragraph...
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.lists"></a><a class="link" href="block.html#quickbook.syntax.block.lists" title="Lists">Lists</a>
-</h4></div></div></div>
-<div class="toc"><dl>
-<dt><span class="section"><a href="block.html#quickbook.syntax.block.lists.ordered_lists">Ordered
-          lists</a></span></dt>
-<dt><span class="section"><a href="block.html#quickbook.syntax.block.lists.list_hierarchies">List
-          Hierarchies</a></span></dt>
-<dt><span class="section"><a href="block.html#quickbook.syntax.block.lists.long_list_lines">Long
-          List Lines</a></span></dt>
-<dt><span class="section"><a href="block.html#quickbook.syntax.block.lists.unordered_lists">Unordered
-          lists</a></span></dt>
-<dt><span class="section">Mixed lists</span></dt>
-</dl></div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="quickbook.syntax.block.lists.ordered_lists"></a><a class="link" href="block.html#quickbook.syntax.block.lists.ordered_lists" title="Ordered lists">Ordered
-          lists</a>
-</h5></div></div></div>
-<pre class="programlisting"># One
-# Two
-# Three
-</pre>
-<p>
-            will generate:
-          </p>
-<div class="orderedlist"><ol type="1">
-<li>
-              One
-            </li>
-<li>
-              Two
-            </li>
-<li>
-              Three
-            </li>
-</ol></div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="quickbook.syntax.block.lists.list_hierarchies"></a><a class="link" href="block.html#quickbook.syntax.block.lists.list_hierarchies" title="List Hierarchies">List
-          Hierarchies</a>
-</h5></div></div></div>
-<p>
-            List hierarchies are supported. Example:
-          </p>
-<pre class="programlisting"># One
-# Two
-# Three
-    # Three.a
-    # Three.b
-    # Three.c
-# Four
-    # Four.a
-        # Four.a.i
-        # Four.a.ii
-# Five
-</pre>
-<p>
-            will generate:
-          </p>
-<div class="orderedlist"><ol type="1">
-<li>
-              One
-            </li>
-<li>
-              Two
-            </li>
-<li>
-              Three
-              <div class="orderedlist"><ol type="a">
-<li>
-                  Three.a
-                </li>
-<li>
-                  Three.b
-                </li>
-<li>
-                  Three.c
-                </li>
-</ol></div>
-</li>
-<li>
-              Fourth
-              <div class="orderedlist"><ol type="a"><li>
-                  Four.a
-                  <div class="orderedlist"><ol type="i">
-<li>
-                      Four.a.i
-                    </li>
-<li>
-                      Four.a.ii
-                    </li>
-</ol></div>
-</li></ol></div>
-</li>
-<li>
-              Five
-            </li>
-</ol></div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="quickbook.syntax.block.lists.long_list_lines"></a><a class="link" href="block.html#quickbook.syntax.block.lists.long_list_lines" title="Long List Lines">Long
-          List Lines</a>
-</h5></div></div></div>
-<p>
-            Long lines will be wrapped appropriately. Example:
-          </p>
-<pre class="programlisting"># A short item.
-# A very long item. A very long item. A very long item.
-  A very long item. A very long item. A very long item.
-  A very long item. A very long item. A very long item.
-  A very long item. A very long item. A very long item.
-  A very long item. A very long item. A very long item.
-# A short item.
-</pre>
-<div class="orderedlist"><ol type="1">
-<li>
-              A short item.
-            </li>
-<li>
-              A very long item. A very long item. A very long item. A very long item.
-              A very long item. A very long item. A very long item. A very long item.
-              A very long item. A very long item. A very long item. A very long item.
-              A very long item. A very long item. A very long item.
-            </li>
-<li>
-              A short item.
-            </li>
-</ol></div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="quickbook.syntax.block.lists.unordered_lists"></a><a class="link" href="block.html#quickbook.syntax.block.lists.unordered_lists" title="Unordered lists">Unordered
-          lists</a>
-</h5></div></div></div>
-<pre class="programlisting">* First
-* Second
-* Third
-</pre>
-<p>
-            will generate:
-          </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-              First
-            </li>
-<li>
-              Second
-            </li>
-<li>
-              Third
-            </li>
-</ul></div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="quickbook.syntax.block.lists.mixed_lists"></a><a class="link" href="block.html#quickbook.syntax.block.lists.mixed_lists" title="Mixed lists">Mixed lists</a>
-</h5></div></div></div>
-<p>
-            Mixed lists (ordered and unordered) are supported. Example:
-          </p>
-<pre class="programlisting"># One
-# Two
-# Three
-    * Three.a
-    * Three.b
-    * Three.c
-# Four
-</pre>
-<p>
-            will generate:
-          </p>
-<div class="orderedlist"><ol type="1">
-<li>
-              One
-            </li>
-<li>
-              Two
-            </li>
-<li>
-              Three
-              <div class="itemizedlist"><ul type="disc">
-<li>
-                  Three.a
-                </li>
-<li>
-                  Three.b
-                </li>
-<li>
-                  Three.c
-                </li>
-</ul></div>
-</li>
-<li>
-              Four
-            </li>
-</ol></div>
-<p>
-            And...
-          </p>
-<pre class="programlisting"># 1
-    * 1.a
-        # 1.a.1
-        # 1.a.2
-    * 1.b
-# 2
-    * 2.a
-    * 2.b
-        # 2.b.1
-        # 2.b.2
-            * 2.b.2.a
-            * 2.b.2.b
-</pre>
-<p>
-            will generate:
-          </p>
-<div class="orderedlist"><ol type="1">
-<li>
-              1
-              <div class="itemizedlist"><ul type="disc">
-<li>
-                  1.a
-                  <div class="orderedlist"><ol type="a">
-<li>
-                      1.a.1
-                    </li>
-<li>
-                      1.a.2
-                    </li>
-</ol></div>
-</li>
-<li>
-                  1.b
-                </li>
-</ul></div>
-</li>
-<li>
-              2
-              <div class="itemizedlist"><ul type="disc">
-<li>
-                  2.a
-                </li>
-<li>
-                  2.b
-                  <div class="orderedlist"><ol type="a">
-<li>
-                      2.b.1
-                    </li>
-<li>
-                      2.b.2
-                      <div class="itemizedlist"><ul type="circle">
-<li>
-                          2.b.2.a
-                        </li>
-<li>
-                          2.b.2.b
-                        </li>
-</ul></div>
-</li>
-</ol></div>
-</li>
-</ul></div>
-</li>
-</ol></div>
-</div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.code"></a><a class="link" href="block.html#quickbook.syntax.block.code" title="Code">Code</a>
-</h4></div></div></div>
-<p>
-          Preformatted code starts with a space or a tab. The code will be syntax
-          highlighted according to the current <a class="link" href="phrase.html#quickbook.syntax.phrase.source_mode" title="Source Mode">Source
-          Mode</a>:
-        </p>
-<p>
-        </p>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
-
-<span class="keyword">int</span> <span class="identifier">main</span><span class="special">()</span>
-<span class="special">{</span>
-    <span class="comment">// Sample code
-</span>    <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"Hello, World\n"</span><span class="special">;</span>
-    <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-<p>
-        </p>
-<pre class="programlisting"><span class="keyword">import</span> <span class="identifier">cgi</span>
-
-<span class="keyword">def</span> <span class="identifier">cookForHtml</span><span class="special">(</span><span class="identifier">text</span><span class="special">):</span>
-    <span class="string">'''"Cooks" the input text for HTML.'''</span>
-
-    <span class="keyword">return</span> <span class="identifier">cgi</span><span class="special">.</span><span class="identifier">escape</span><span class="special">(</span><span class="identifier">text</span><span class="special">)</span>
-</pre>
-<p>
-        </p>
-<p>
-          Macros that are already defined are expanded in source code. Example:
-        </p>
-<pre class="programlisting">[def __array__ [@http://www.boost.org/doc/html/array/reference.html array]]
-[def __boost__ [@http://www.boost.org/libs/libraries.htm boost]]
-
-    using __boost__::__array__;
-</pre>
-<p>
-          Generates:
-        </p>
-<pre class="programlisting"><span class="keyword">using</span> boost<span class="special">::</span>array<span class="special">;</span>
-</pre>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.escape_back"></a><a class="link" href="block.html#quickbook.syntax.block.escape_back" title="Escaping Back To QuickBook"> Escaping Back
-        To QuickBook</a>
-</h4></div></div></div>
-<p>
-          Inside code, code blocks and inline code, QuickBook does not allow any
-          markup to avoid conflicts with the target syntax (e.g. c++). In case you
-          need to switch back to QuickBook markup inside code, you can do so using
-          a language specific <span class="emphasis"><em>escape-back</em></span> delimiter. In C++
-          and Python, the delimiter is the double tick (back-quote): "``"
-          and "``". Example:
-        </p>
-<pre class="programlisting">void ``[@http://en.wikipedia.org/wiki/Foo#Foo.2C_Bar_and_Baz foo]``()
-{
-}
-</pre>
-<p>
-          Will generate:
-        </p>
-<pre class="programlisting"><span class="keyword">void</span> foo<span class="special">()</span>
-<span class="special">{</span>
-<span class="special">}</span>
-</pre>
-<p>
-          When escaping from code to QuickBook, only phrase level markups are allowed.
-          Block level markups like lists, tables etc. are not allowed.
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.preformatted"></a><a class="link" href="block.html#quickbook.syntax.block.preformatted" title="Preformatted">Preformatted</a>
-</h4></div></div></div>
-<p>
-          Sometimes, you don't want some preformatted text to be parsed as C++. In
-          such cases, use the <code class="literal">[pre ... ]</code> markup block.
-        </p>
-<pre class="programlisting">[pre
-
-    Some *preformatted* text                    Some *preformatted* text
-
-        Some *preformatted* text            Some *preformatted* text
-
-            Some *preformatted* text    Some *preformatted* text
-
-]
-</pre>
-<p>
-          Spaces, tabs and newlines are rendered as-is. Unlike all quickbook block
-          level markup, pre (and Code) are the only ones that allow multiple newlines.
-          The markup above will generate:
-        </p>
-<pre class="programlisting">Some <span class="bold"><strong>preformatted</strong></span> text                    Some <span class="bold"><strong>preformatted</strong></span> text
-
-    Some <span class="bold"><strong>preformatted</strong></span> text            Some <span class="bold"><strong>preformatted</strong></span> text
-
-        Some <span class="bold"><strong>preformatted</strong></span> text    Some <span class="bold"><strong>preformatted</strong></span> text
-
-</pre>
-<p>
-          Notice that unlike Code, phrase markup such as font style is still permitted
-          inside <code class="literal">pre</code> blocks.
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.blockquote"></a><a class="link" href="block.html#quickbook.syntax.block.blockquote" title="Blockquote">Blockquote</a>
-</h4></div></div></div>
-<pre class="programlisting">[:sometext...]
-</pre>
-<div class="blockquote"><blockquote class="blockquote">
-<p>
-            </p>
-<p>
-              Indents the paragraph. This applies to one paragraph only.
-            </p>
-<p>
-          </p>
-</blockquote></div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.admonitions"></a><a class="link" href="block.html#quickbook.syntax.block.admonitions" title="Admonitions">Admonitions</a>
-</h4></div></div></div>
-<pre class="programlisting">[note This is a note]
-[tip This is a tip]
-[important This is important]
-[caution This is a caution]
-[warning This is a warning]
-</pre>
-<p>
-          generates DocBook admonitions:
-        </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" 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>
-            This is a note
-          </p></td></tr>
-</table></div>
-<div class="tip"><table border="0" summary="Tip">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../../../../../../doc/html/images/tip.png"></td>
-<th align="left">Tip</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            This is a tip
-          </p></td></tr>
-</table></div>
-<div class="important"><table border="0" summary="Important">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="../../../../../../doc/html/images/important.png"></td>
-<th align="left">Important</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            This is important
-          </p></td></tr>
-</table></div>
-<div class="caution"><table border="0" summary="Caution">
-<tr>
-<td rowspan="2" align="center" 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>
-            This is a caution
-          </p></td></tr>
-</table></div>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../doc/html/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            This is a warning
-          </p></td></tr>
-</table></div>
-<p>
-          These are the only admonitions supported by DocBook.
-          So, for example <code class="literal">[information This is some information]</code>
-          is unlikely to produce the desired effect.
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.headings"></a><a class="link" href="block.html#quickbook.syntax.block.headings" title="Headings">Headings</a>
-</h4></div></div></div>
-<pre class="programlisting">[h1 Heading 1]
-[h2 Heading 2]
-[h3 Heading 3]
-[h4 Heading 4]
-[h5 Heading 5]
-[h6 Heading 6]
-</pre>
-<a name="quickbook.syntax.block.headings.heading_1"></a><h2>
-<a name="id4957165"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.headings.heading_1">Heading 1</a>
-        </h2>
-<a name="quickbook.syntax.block.headings.heading_2"></a><h3>
-<a name="id4957186"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.headings.heading_2">Heading 2</a>
-        </h3>
-<a name="quickbook.syntax.block.headings.heading_3"></a><h4>
-<a name="id4957206"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.headings.heading_3">Heading 3</a>
-        </h4>
-<a name="quickbook.syntax.block.headings.heading_4"></a><h5>
-<a name="id4957227"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.headings.heading_4">Heading 4</a>
-        </h5>
-<a name="quickbook.syntax.block.headings.heading_5"></a><h6>
-<a name="id4957248"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.headings.heading_5">Heading 5</a>
-        </h6>
-<a name="quickbook.syntax.block.headings.heading_6"></a><h5>
-<a name="id4957268"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.headings.heading_6">Heading 6</a>
-        </h5>
-<p>
-          Headings 1-3 [h1 h2 and h3] will automatically have anchors with normalized
-          names with <code class="literal">name="section_id.normalized_header_text"</code>
-          (i.e. valid characters are <code class="literal">a-z</code>, <code class="literal">A-Z</code>,
-          <code class="literal">0-9</code> and <code class="literal">_</code>. All non-valid characters
-          are converted to underscore and all upper-case are converted to lower-case.
-          For example: Heading 1 in section Section 2 will be normalized to <code class="literal">section_2.heading_1</code>).
-          You can use:
-        </p>
-<pre class="programlisting">[link section_id.normalized_header_text The link text]
-</pre>
-<p>
-          to link to them. See <a class="link" href="phrase.html#quickbook.syntax.phrase.anchor_links" title="Anchor links">Anchor
-          links</a> and <a class="link" href="block.html#quickbook.syntax.block.section" title="Section">Section</a>
-          for more info.
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.generic_heading"></a><a class="link" href="block.html#quickbook.syntax.block.generic_heading" title="Generic Heading">Generic Heading</a>
-</h4></div></div></div>
-<p>
-          In cases when you don't want to care about the heading level (1 to 6),
-          you can use the <span class="emphasis"><em>Generic Heading</em></span>:
-        </p>
-<pre class="programlisting">[heading Heading]
-</pre>
-<p>
-          The <span class="emphasis"><em>Generic Heading</em></span> assumes the level, plus one, of
-          the innermost section where it is placed. For example, if it is placed
-          in the outermost section, then, it assumes <span class="emphasis"><em>h2</em></span>.
-        </p>
-<p>
-          Headings are often used as an alternative to sections. It is used particularly
-          if you do not want to start a new section. In many cases, however, headings
-          in a particular section is just flat. Example:
-        </p>
-<pre class="programlisting">[section A]
-[h2 X]
-[h2 Y]
-[h2 Z]
-[endsect]
-</pre>
-<p>
-          Here we use h2 assuming that section A is the outermost level. If it is
-          placed in an inner level, you'll have to use h3, h4, etc. depending on
-          where the section is. In general, it is the section level plus one. It
-          is rather tedious, however, to scan the section level everytime. If you
-          rewrite the example above as shown below, this will be automatic:
-        </p>
-<pre class="programlisting">[section A]
-[heading X]
-[heading Y]
-[heading Z]
-[endsect]
-</pre>
-<p>
-          They work well regardless where you place them. You can rearrange sections
-          at will without any extra work to ensure correct heading levels. In fact,
-          with <span class="emphasis"><em>section</em></span> and <span class="emphasis"><em>heading</em></span>, you
-          have all you need. <span class="emphasis"><em>h1</em></span>..<span class="emphasis"><em>h6</em></span> becomes
-          redundant. <span class="emphasis"><em>h1</em></span>..<span class="emphasis"><em>h6</em></span> might be deprecated
-          in the future.
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.macros"></a><a class="link" href="block.html#quickbook.syntax.block.macros" title="Macros">Macros</a>
-</h4></div></div></div>
-<pre class="programlisting">[def macro_identifier some text]
-</pre>
-<p>
-          When a macro is defined, the identifier replaces the text anywhere in the
-          file, in paragraphs, in markups, etc. macro_identifier is a string of non-
-          white space characters except ']'. A macro may not follow an alphabetic
-          character or the underscore. The replacement text can be any phrase (even
-          marked up). Example:
-        </p>
-<pre class="programlisting">[def sf_logo [$http://sourceforge.net/sflogo.php?group_id=28447&amp;type=1]]
-sf_logo
-</pre>
-<p>
-          Now everywhere the sf_logo is placed, the picture will be inlined.
-        </p>
-<p>
-          <span class="inlinemediaobject"></span>
-        </p>
-<div class="tip"><table border="0" summary="Tip">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../../../../../../doc/html/images/tip.png"></td>
-<th align="left">Tip</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            It's a good idea to use macro identifiers that are distinguishable. For
-            instance, in this document, macro identifiers have two leading and trailing
-            underscores (e.g. <code class="literal">__spirit__</code>). The reason is to avoid unwanted
-            macro replacement.
-          </p></td></tr>
-</table></div>
-<p>
-          Links (URLS) and images are good candidates for macros. <span class="bold"><strong>1</strong></span>)
-          They tend to change a lot. It is a good idea to place all links and images
-          in one place near the top to make it easy to make changes. <span class="bold"><strong>2</strong></span>)
-          The syntax is not pretty. It's easier to read and write, e.g. <code class="literal">__spirit__</code>
-          than <code class="literal">[@http://spirit.sourceforge.net Spirit]</code>.
-        </p>
-<p>
-          Some more examples:
-        </p>
-<pre class="programlisting">[def :-)            [$theme/smiley.png]]
-[def __spirit__     [@http://spirit.sourceforge.net Spirit]]
-</pre>
-<p>
-          (See <a class="link" href="phrase.html#quickbook.syntax.phrase.images" title="Images">Images</a> and
-          <a class="link" href="phrase.html#quickbook.syntax.phrase.links" title="Links">Links</a>)
-        </p>
-<p>
-          Invoking these macros:
-        </p>
-<pre class="programlisting">Hi __spirit__  :-)
-</pre>
-<p>
-          will generate this:
-        </p>
-<p>
-          Hi Spirit <span class="inlinemediaobject"><img src="../../images/smiley.png" alt="smiley"></span>
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.predefined_macros"></a><a class="link" href="block.html#quickbook.syntax.block.predefined_macros" title="Predefined Macros">Predefined
-        Macros</a>
-</h4></div></div></div>
-<p>
-          Quickbook has some predefined macros that you can already use.
-        </p>
-<div class="table">
-<a name="id4957675"></a><p class="title"><b>Table 3. Predefined Macros</b></p>
-<div class="table-contents"><table class="table" summary="Predefined Macros">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-              <p>
-                Macro
-              </p>
-              </th>
-<th>
-              <p>
-                Meaning
-              </p>
-              </th>
-<th>
-              <p>
-                Example
-              </p>
-              </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-              <p>
-                __DATE__
-              </p>
-              </td>
-<td>
-              <p>
-                Today's date
-              </p>
-              </td>
-<td>
-              <p>
-                2008-Jul-28
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                __TIME__
-              </p>
-              </td>
-<td>
-              <p>
-                The current time
-              </p>
-              </td>
-<td>
-              <p>
-                10:49:54 PM
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                __FILENAME__
-              </p>
-              </td>
-<td>
-              <p>
-                Quickbook source filename
-              </p>
-              </td>
-<td>
-              <p>
-                C:\cygwin\home\ericne\boost\org\trunk\tools\quickbook\doc\quickbook.qbk
-              </p>
-              </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break">
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.templates"></a><a class="link" href="block.html#quickbook.syntax.block.templates" title="Templates">Templates</a>
-</h4></div></div></div>
-<p>
-          Templates provide a more versatile text substitution mechanism. Templates
-          come in handy when you need to create parameterizable, multi-line, boilerplate
-          text that you specify once and expand many times. Templates accept one
-          or more arguments. These arguments act like place-holders for text replacement.
-          Unlike simple macros, which are limited to phrase level markup, templates
-          can contain block level markup (e.g. paragraphs, code blocks and tables).
-        </p>
-<p>
-          Example template:
-        </p>
-<pre class="programlisting">[template person[name age what]
-
-Hi, my name is [name]. I am [age] years old. I am a [what].
-
-]
-</pre>
-<a name="quickbook.syntax.block.templates.template_identifier"></a><h6>
-<a name="id4957835"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.templates.template_identifier">Template
-          Identifier</a>
-        </h6>
-<p>
-          Template identifiers can either consist of:
-        </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-            An initial alphabetic character or the underscore, followed by zero or
-            more alphanumeric characters or the underscore. This is similar to your
-            typical C/C++ identifier.
-          </li>
-<li>
-            A single character punctuation (a non-alphanumeric printable character)
-          </li>
-</ul></div>
-<a name="quickbook.syntax.block.templates.formal_template_arguments"></a><h6>
-<a name="id4957876"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.templates.formal_template_arguments">Formal
-          Template Arguments</a>
-        </h6>
-<p>
-          Template formal arguments are identifiers consisting of an initial alphabetic
-          character or the underscore, followed by zero or more alphanumeric characters
-          or the underscore. This is similar to your typical C/C++ identifier.
-        </p>
-<p>
-          A template formal argument temporarily hides a template of the same name
-          at the point where the <a class="link" href="block.html#quickbook.syntax.block.templates.template_expansion">template
-          is expanded</a>. Note that the body of the <code class="literal">person</code>
-          template above refers to <code class="literal">name</code> <code class="literal">age</code>
-          and <code class="literal">what</code> as <code class="literal">[name]</code> <code class="literal">[age]</code>
-          and <code class="literal">[what]</code>. <code class="literal">name</code> <code class="literal">age</code>
-          and <code class="literal">what</code> are actually templates that exist in the duration
-          of the template call.
-        </p>
-<a name="quickbook.syntax.block.templates.template_body"></a><h6>
-<a name="id4957984"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.templates.template_body">Template
-          Body</a>
-        </h6>
-<p>
-          The template body can be just about any QuickBook block or phrase. There
-          are actually two forms. Templates may be phrase or block level. Phrase
-          templates are of the form:
-        </p>
-<pre class="programlisting">[template sample[arg1 arg2...argN] replacement text... ]
-</pre>
-<p>
-          Block templates are of the form:
-        </p>
-<pre class="programlisting">[template sample[arg1 arg2...argN]
-replacement text...
-]
-</pre>
-<p>
-          The basic rule is as follows: if a newline immediately follows the argument
-          list, then it is a block template, otherwise, it is a phrase template.
-          Phrase templates are typically expanded as part of phrases. Like macros,
-          block level elements are not allowed in phrase templates.
-        </p>
-<a name="quickbook.syntax.block.templates.template_expansion"></a><h6>
-<a name="id4958041"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.templates.template_expansion">Template
-          Expansion</a>
-        </h6>
-<p>
-          You expand a template this way:
-        </p>
-<pre class="programlisting">[template_identifier arg1..arg2..arg3]
-</pre>
-<p>
-          At template expansion, you supply the actual arguments. The template will
-          be expanded with your supplied arguments. Example:
-        </p>
-<pre class="programlisting">[person James Bond..39..Spy]
-[person Santa Clause..87..Big Red Fatso]
-</pre>
-<p>
-          Which will expand to:
-        </p>
-<p>
-          </p>
-<p>
-            Hi, my name is James Bond. I am 39 years old. I am a Spy.
-          </p>
-<p>
-          </p>
-<p>
-            Hi, my name is Santa Clause. I am 87 years old. I am a Big Red Fatso.
-          </p>
-<p>
-        </p>
-<div class="caution"><table border="0" summary="Caution">
-<tr>
-<td rowspan="2" align="center" 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>
-            A word of caution: Templates are recursive. A template can call another
-            template or even itself, directly or indirectly. There are no control
-            structures in QuickBook (yet) so this will always mean infinite recursion.
-            QuickBook can detect this situation and report an error if recursion
-            exceeds a certain limit.
-          </p></td></tr>
-</table></div>
-<p>
-          Each actual argument can be a word, a text fragment or just about any
-          <a class="link" href="phrase.html" title="Phrase Level Elements">QuickBook phrase</a>. Arguments
-          are separated by the double dot <code class="literal">".."</code> and terminated
-          by the close parenthesis.
-        </p>
-<a name="quickbook.syntax.block.templates.nullary_templates"></a><h6>
-<a name="id4958138"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.templates.nullary_templates">Nullary
-          Templates</a>
-        </h6>
-<p>
-          Nullary templates look and act like simple macros. Example:
-        </p>
-<pre class="programlisting">[template alpha[]'''&amp;#945;''']
-[template beta[]'''&amp;#946;''']
-</pre>
-<p>
-          Expanding:
-        </p>
-<pre class="programlisting">Some squigles...[*[alpha][beta]]</pre>
-<p>
-          We have:
-        </p>
-<p>
-          Some squiggles...<span class="bold"><strong>&#945;&#946;</strong></span>
-        </p>
-<p>
-          The difference with macros are
-        </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-            The explicit <a class="link" href="block.html#quickbook.syntax.block.templates.template_expansion">template
-            expansion syntax</a>. This is an advantage because, now, we don't
-            have to use obscure naming conventions like double underscores (e.g.
-            __alpha__) to avoid unwanted macro replacement.
-          </li>
-<li>
-            The template is expanded at the point where it is invoked. A macro is
-            expanded immediately at its point of declaration. This is subtle and
-            can cause a slight difference in behavior especially if you refer to
-            other macros and templates in the body.
-          </li>
-</ul></div>
-<p>
-          The empty brackets after the template identifier (<code class="literal">alpha[]</code>)
-          indicates no arguments. If the template body does not look like a template
-          argument list, we can elide the empty brackets. Example:
-        </p>
-<pre class="programlisting">[template aristotle_quote Aristotle: [*['Education is the best provision
-for the journey to old age.]]]
-</pre>
-<p>
-          Expanding:
-        </p>
-<pre class="programlisting">Here's a quote from [aristotle_quote].
-</pre>
-<p>
-          We have:
-        </p>
-<p>
-          Here's a quote from Aristotle: <span class="bold"><strong><span class="emphasis"><em>Education
-          is the best provision for the journey to old age.</em></span></strong></span>.
-        </p>
-<p>
-          The disadvantage is that you can't avoid the space between the template
-          identifier, <code class="computeroutput"><span class="identifier">aristotle_quote</span></code>,
-          and the template body "Aristotle...". This space will be part
-          of the template body. If that space is unwanted, use empty brackets or
-          use the space escape: "<code class="computeroutput"><span class="special">\</span> </code>".
-          Example:
-        </p>
-<pre class="programlisting">[template tag\ _tag]
-</pre>
-<p>
-          Then expanding:
-        </p>
-<pre class="programlisting">`struct` x[tag];
-</pre>
-<p>
-          We have:
-        </p>
-<p>
-          <code class="computeroutput"><span class="keyword">struct</span></code> x_tag;
-        </p>
-<p>
-          You have a couple of ways to do it. I personally prefer the explicit empty
-          brackets, though.
-        </p>
-<a name="quickbook.syntax.block.templates.simple_arguments"></a><h6>
-<a name="id4958354"></a>
-          <a class="link" href="block.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:
-        </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-            Break the last argument into two, at the first space found (<code class="literal">'',
-            '\n', \t' or '\r'</code>).
-          </li>
-<li>
-            Repeat until there are enough arguments or if there are no more spaces
-            found (in which case, an error is reported).
-          </li>
-</ul></div>
-<p>
-          For example:
-        </p>
-<pre class="programlisting">[template simple[a b c d] [a][b][c][d]]
-[simple w x y z]
-</pre>
-<p>
-          will produce:
-        </p>
-<p>
-          wxyz
-        </p>
-<p>
-          "w x y z" is initially treated as a single argument because we
-          didn't supply any <code class="literal">".."</code> separators. However,
-          since <code class="literal">simple</code> expects 4 arguments, "w x y z"
-          is broken down iteratively (applying the logic above) until we have "w",
-          "x", "y" and "z".
-        </p>
-<p>
-          QuickBook only tries to get the arguments it needs. For example:
-        </p>
-<pre class="programlisting">[simple w x y z trail]
-</pre>
-<p>
-          will produce:
-        </p>
-<p>
-          wxyz trail
-        </p>
-<p>
-          The arguments being: "w", "x", "y" and "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:
-        </p>
-<pre class="programlisting">[simple what do you think ..m a n?]
-</pre>
-<p>
-          will produce:
-        </p>
-<p>
-          what do you think man?
-        </p>
-<a name="quickbook.syntax.block.templates.punctuation_templates"></a><h6>
-<a name="id4958508"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.templates.punctuation_templates">Punctuation
-          Templates</a>
-        </h6>
-<p>
-          With templates, one of our objectives is to allow us to rewrite QuickBook
-          in QuickBook (as a qbk library). For that to happen, we need to accommodate
-          single character punctuation templates which are fairly common in QuickBook.
-          You might have noticed that single character punctuations are allowed as
-          <a class="link" href="block.html#quickbook.syntax.block.templates.template_identifier">template
-          identifiers</a>. Example:
-        </p>
-<pre class="programlisting">[template ![bar] &lt;hey&gt;[bar]&lt;/hey&gt;]
-</pre>
-<p>
-          Now, expanding this:
-        </p>
-<pre class="programlisting">[!baz]
-</pre>
-<p>
-          We will have:
-        </p>
-<pre class="programlisting">&lt;hey&gt;baz&lt;/hey&gt;
-</pre>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.blurbs"></a><a class="link" href="block.html#quickbook.syntax.block.blurbs" title="Blurbs">Blurbs</a>
-</h4></div></div></div>
-<pre class="programlisting">[blurb :-) [*An eye catching advertisement or note...]
-
-    __spirit__ is an object-oriented recursive-descent parser generator framework
-    implemented using template meta-programming techniques. Expression templates
-    allow us to approximate the syntax of Extended Backus-Normal Form (EBNF)
-    completely in C++.
-]
-</pre>
-<p>
-          will generate this:
-        </p>
-<div class="sidebar">
-<p class="title"><b></b></p>
-<p>
-          <span class="inlinemediaobject"><img src="../../images/smiley.png" alt="smiley"></span> <span class="bold"><strong>An eye catching advertisement
-          or note...</strong></span>
-        </p>
-<p>
-          Spirit is an object-oriented
-          recursive-descent parser generator framework implemented using template
-          meta-programming techniques. Expression templates allow us to approximate
-          the syntax of Extended Backus-Normal Form (EBNF) completely in C++.
-        </p>
-</div>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" 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>
-            Prefer <a class="link" href="block.html#quickbook.syntax.block.admonitions" title="Admonitions">admonitions</a>
-            wherever appropriate.
-          </p></td></tr>
-</table></div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.tables"></a><a class="link" href="block.html#quickbook.syntax.block.tables" title="Tables">Tables</a>
-</h4></div></div></div>
-<pre class="programlisting">[table A Simple Table
-    [[Heading 1] [Heading 2] [Heading 3]]
-    [[R0-C0]     [R0-C1]     [R0-C2]]
-    [[R1-C0]     [R1-C1]     [R1-C2]]
-    [[R2-C0]     [R2-C1]     [R2-C2]]
-]
-</pre>
-<p>
-          will generate:
-        </p>
-<div class="table">
-<a name="id4958692"></a><p class="title"><b>Table 4. A Simple Table</b></p>
-<div class="table-contents"><table class="table" summary="A Simple Table">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-              <p>
-                Heading 1
-              </p>
-              </th>
-<th>
-              <p>
-                Heading 2
-              </p>
-              </th>
-<th>
-              <p>
-                Heading 3
-              </p>
-              </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-              <p>
-                R0-C0
-              </p>
-              </td>
-<td>
-              <p>
-                R0-C1
-              </p>
-              </td>
-<td>
-              <p>
-                R0-C2
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                R2-C0
-              </p>
-              </td>
-<td>
-              <p>
-                R2-C1
-              </p>
-              </td>
-<td>
-              <p>
-                R2-C2
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                R3-C0
-              </p>
-              </td>
-<td>
-              <p>
-                R3-C1
-              </p>
-              </td>
-<td>
-              <p>
-                R3-C2
-              </p>
-              </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-          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:
-        </p>
-<pre class="programlisting">[table Table with fat cells
-    [[Heading 1] [Heading 2]]
-    [
-        [Row 0, Col 0: a small cell]
-        [
-            Row 0, Col 1: a big fat cell with paragraphs
-
-            Boost provides free peer-reviewed portable C++ source libraries.
-
-            We emphasize libraries that work well with the C++ Standard Library.
-            Boost libraries are intended to be widely useful, and usable across
-            a broad spectrum of applications. The Boost license encourages both
-            commercial and non-commercial use.
-        ]
-    ]
-    [
-        [Row 1, Col 0: a small cell]
-        [Row 1, Col 1: a small cell]
-    ]
-]
-</pre>
-<p>
-          and thus:
-        </p>
-<div class="table">
-<a name="id4958841"></a><p class="title"><b>Table 5. Table with fat cells</b></p>
-<div class="table-contents"><table class="table" summary="Table with fat cells">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-              <p>
-                Heading 1
-              </p>
-              </th>
-<th>
-              <p>
-                Heading 2
-              </p>
-              </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-              <p>
-                Row 0, Col 0: a small cell
-              </p>
-              </td>
-<td>
-              <p>
-                Row 0, Col 1: a big fat cell with paragraphs
-              </p>
-              <p>
-                Boost provides free peer-reviewed portable C++ source libraries.
-              </p>
-              <p>
-                We emphasize libraries that work well with the C++ Standard Library.
-                Boost libraries are intended to be widely useful, and usable across
-                a broad spectrum of applications. The Boost license encourages both
-                commercial and non-commercial use.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                Row 1, Col 0: a small cell
-              </p>
-              </td>
-<td>
-              <p>
-                Row 1, Col 1: a small cell
-              </p>
-              </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-          Here's how to have preformatted blocks of code in a table cell:
-        </p>
-<pre class="programlisting">[table Table with code
-    [[Comment] [Code]]
-    [
-        [My first program]
-        [``
-            #include &lt;iostream&gt;
-
-            int main()
-            {
-                std::cout &lt;&lt; "Hello, World!" &lt;&lt; std::endl;
-                return 0;
-            }
-        ``]
-    ]
-]
-</pre>
-<div class="table">
-<a name="id4958948"></a><p class="title"><b>Table 6. Table with code</b></p>
-<div class="table-contents"><table class="table" summary="Table with code">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-              <p>
-                Comment
-              </p>
-              </th>
-<th>
-              <p>
-                Code
-              </p>
-              </th>
-</tr></thead>
-<tbody><tr>
-<td>
-              <p>
-                My first program
-              </p>
-              </td>
-<td>
-              <p>
-                
-</p>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
-
-<span class="keyword">int</span> <span class="identifier">main</span><span class="special">()</span>
-<span class="special">{</span>
-    <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"Hello, World!"</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>
-    <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-<p>
-              </p>
-              </td>
-</tr></tbody>
-</table></div>
-</div>
-<br class="table-break">
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.variable_lists"></a><a class="link" href="block.html#quickbook.syntax.block.variable_lists" title="Variable Lists">Variable Lists</a>
-</h4></div></div></div>
-<pre class="programlisting">[variablelist A Variable List
-    [[term 1] [The definition of term 1]]
-    [[term 2] [The definition of term 2]]
-    [[term 3] [
-    The definition of term 3.
-
-    Definitions may contain paragraphs.
-    ]]
-]
-</pre>
-<p>
-          will generate:
-        </p>
-<div class="variablelist">
-<p class="title"><b>A Variable List</b></p>
-<dl>
-<dt><span class="term">term 1</span></dt>
-<dd><p>
-              The definition of term 1
-            </p></dd>
-<dt><span class="term">term 2</span></dt>
-<dd><p>
-              The definition of term 2
-            </p></dd>
-<dt><span class="term">term 3</span></dt>
-<dd>
-<p>
-              The definition of term 3.
-            </p>
-<p>
-              Definitions may contain paragraphs.
-            </p>
-</dd>
-</dl>
-</div>
-<p>
-          The rules for variable lists are the same as for tables, except that only
-          2 "columns" are allowed. The first column contains the terms,
-          and the second column contains the definitions. Those familiar with HTML
-          will recognize this as a "definition list".
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.include"></a><a class="link" href="block.html#quickbook.syntax.block.include" title="Include">Include</a>
-</h4></div></div></div>
-<p>
-          You can include one QuickBook file from another. The syntax is simply:
-        </p>
-<pre class="programlisting">[include someother.qbk]
-</pre>
-<p>
-          The included file will be processed as if it had been cut and pasted into
-          the current document, with the following exceptions:
-        </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-            The __FILENAME__ predefined macro will reflect the name of the file currently being
-            processed.
-          </li>
-<li>
-            Any macros defined in the included file are scoped to that file.
-          </li>
-</ul></div>
-<p>
-          The <code class="literal">[include]</code> directive lets you specify a document
-          id to use for the included file. When this id is not explicitly specified,
-          the id defaults to the filename ("someother", in the example
-          above). You can specify the id like this:
-        </p>
-<pre class="programlisting">[include:someid someother.qbk]
-</pre>
-<p>
-          All auto-generated anchors will use the document id as a unique prefix.
-          So for instance, if there is a top section in someother.qbk named "Intro",
-          the named anchor for that section will be "someid.intro", and
-          you can link to it with <code class="literal">[link someid.intro The Intro]</code>.
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.import"></a><a class="link" href="block.html#quickbook.syntax.block.import" title="Import">Import</a>
-</h4></div></div></div>
-<p>
-          When documenting code, you'd surely need to present code from actual source
-          files. While it is possible to copy some code and paste them in your QuickBook
-          file, doing so is error prone and the extracted code in the documentation
-          tends to get out of sync with the actual code as the code evolves. The
-          problem, as always, is that once documentation is written, the tendency
-          is for the docs to languish in the archives without maintenance.
-        </p>
-<p>
-          QuickBook's import facility provides a nice solution.
-        </p>
-<a name="quickbook.syntax.block.import.example"></a><h6>
-<a name="id4959336"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.import.example">Example</a>
-        </h6>
-<p>
-          You can effortlessly import code snippets from source code into your QuickBook.
-          The following illustrates how this is done:
-        </p>
-<pre class="programlisting">[import ../test/stub.cpp]
-[foo]
-[bar]
-</pre>
-<p>
-          The first line:
-        </p>
-<pre class="programlisting">[import ../test/stub.cpp]
-</pre>
-<p>
-          collects specially marked-up code snippets from stub.cpp
-          and places them in your QuickBook file as virtual templates. Each of the
-          specially marked-up code snippets has a name (e.g. <code class="computeroutput"><span class="identifier">foo</span></code>
-          and <code class="computeroutput"><span class="identifier">bar</span></code> in the example
-          above). This shall be the template identifier for that particular code
-          snippet. The second and third line above does the actual template expansion:
-        </p>
-<pre class="programlisting">[foo]
-[bar]
-</pre>
-<p>
-          And the result is:
-        </p>
-<p>
-          </p>
-<p>
-            This is the <span class="bold"><strong><span class="emphasis"><em>foo</em></span></strong></span>
-            function.
-          </p>
-<p>
-          </p>
-<p>
-            This description can have paragraphs...
-          </p>
-<p>
-          </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-              lists
-            </li>
-<li>
-              etc.
-            </li>
-</ul></div>
-<p>
-          </p>
-<p>
-            And any quickbook block markup.
-          </p>
-<p>
-          </p>
-<p>
-            
-</p>
-<pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">foo</span><span class="special">()</span>
-<span class="special">{</span>
-    <span class="comment">// return 'em, foo man!
-</span>    <span class="keyword">return</span> <span class="string">"foo"</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-<p>
-          </p>
-<p>
-          </p>
-<p>
-            This is the <span class="bold"><strong><span class="emphasis"><em>bar</em></span></strong></span>
-            function
-          </p>
-<p>
-          </p>
-<p>
-            
-</p>
-<pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">bar</span><span class="special">()</span>
-<span class="special">{</span>
-    <span class="comment">// return 'em, bar man!
-</span>    <span class="keyword">return</span> <span class="string">"bar"</span><span class="special">;</span>
-<span class="special">}</span></pre>
-<p>
-          </p>
-<p>
-          </p>
-<p>
-            Some trailing text here
-          </p>
-<p>
-        </p>
-<a name="quickbook.syntax.block.import.code_snippet_markup"></a><h6>
-<a name="id4959612"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.import.code_snippet_markup">Code
-          Snippet Markup</a>
-        </h6>
-<p>
-          Note how the code snippets in stub.cpp
-          get marked up. We use distinguishable comments following the form:
-        </p>
-<pre class="programlisting"><span class="comment">//[id
-</span><span class="identifier">some</span> <span class="identifier">code</span> <span class="identifier">here</span>
-<span class="comment">//]
-</span></pre>
-<p>
-          The first comment line above initiates a named code-snippet. This prefix
-          will not be visible in quickbook. The entire code-snippet in between <code class="computeroutput"><span class="comment">//[id</span></code> and <code class="computeroutput"><span class="comment">//]</span></code>
-          will be inserted as a template in quickbook with name <span class="emphasis"><em><span class="emphasis"><em>id</em></span></em></span>.
-          The comment <code class="computeroutput"><span class="comment">//]</span></code> ends a code-snippet
-          This too will not be visible in quickbook.
-        </p>
-<a name="quickbook.syntax.block.import.special_comments"></a><h6>
-<a name="id4959722"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.import.special_comments">Special
-          Comments</a>
-        </h6>
-<p>
-          Special comments of the form:
-        </p>
-<pre class="programlisting"><span class="comment">//` some [*quickbook] markup here
-</span></pre>
-<p>
-          and:
-        </p>
-<pre class="programlisting"><span class="comment">/*` some [*quickbook] markup here */</span>
-</pre>
-<p>
-          will be parsed by QuickBook. This can contain quickbook <span class="emphasis"><em>blocks</em></span>
-          (e.g. sections, paragraphs, tables, etc). In the first case, the initial
-          slash-slash, tick and white-space shall be ignored. In the second, the
-          initial slash-star-tick and the final star-slash shall be ignored.
-        </p>
-<p>
-          Special comments of the form:
-        </p>
-<pre class="programlisting"><span class="comment">/*&lt;- this C++ comment will be ignored -&gt;*/</span>
-</pre>
-<p>
-          or
-        </p>
-<pre class="programlisting"><span class="comment">/*&lt;-*/</span> <span class="string">"this c++ code  will be ignored"</span> <span class="comment">/*-&gt;*/</span>
-</pre>
-<p>
-          or
-        </p>
-<pre class="programlisting"><span class="comment">//&lt;-
-</span><span class="keyword">private</span><span class="special">:</span>
-    <span class="keyword">int</span> <span class="identifier">some_member</span><span class="special">;</span>
-<span class="comment">//-&gt;
-</span></pre>
-<p>
-          can be used to inhibit code from passing through to quickbook. All text
-          between the delimeters will simply be ignored.
-        </p>
-<a name="quickbook.syntax.block.import.callouts"></a><h6>
-<a name="id4959882"></a>
-          <a class="link" href="block.html#quickbook.syntax.block.import.callouts">Callouts</a>
-        </h6>
-<p>
-          Special comments of the form:
-        </p>
-<pre class="programlisting"><span class="comment">/*&lt; some [*quickbook] markup here &gt;*/</span>
-</pre>
-<p>
-          will be regarded as callouts. These will be collected, numbered and rendered
-          as a "callout bug" (a small icon with a number). After the whole
-          snippet is parsed, the callout list is generated. See Callouts
-          for details. Example:
-        </p>
-<p>
-          </p>
-<p>
-            
-</p>
-<pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">foo_bar</span><span class="special">()</span> <span class="callout_bug"><a class="co" name="quickbook0co" href="block.html#quickbook0"><img src="../../images/callouts/1.png" alt="1" border="0"></a></span>
-<span class="special">{</span>
-    <span class="keyword">return</span> <span class="string">"foo-bar"</span><span class="special">;</span> <span class="callout_bug"><a class="co" name="quickbook1co" href="block.html#quickbook1"><img src="../../images/callouts/2.png" alt="2" border="0"></a></span>
-<span class="special">}</span>
-</pre>
-<p>
-          </p>
-<p>
-          </p>
-<p>
-            </p>
-<div class="calloutlist"><table border="0" summary="Callout list">
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="quickbook0"></a>
 </p></td>
-<td valign="top" align="left"><p> The <span class="emphasis"><em>Mythical</em></span> FooBar. See <a href="http://en.wikipedia.org/wiki/Foobar" target="_top">Foobar
-            for details</a> </p></td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="quickbook1"></a>
 </p></td>
-<td valign="top" align="left"><p> return 'em, foo-bar man! </p></td>
-</tr>
-</table></div>
-<p>
-          </p>
-<p>
-        </p>
-<p>
-          This is the actual code:
-        </p>
-<pre class="programlisting"><span class="comment">//[ foo_bar
-</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">foo_bar</span><span class="special">()</span> <span class="comment">/*&lt; The /Mythical/ FooBar.
-                      See [@http://en.wikipedia.org/wiki/Foobar Foobar for details] &gt;*/</span>
-<span class="special">{</span>
-    <span class="keyword">return</span> <span class="string">"foo-bar"</span><span class="special">;</span> <span class="comment">/*&lt; return 'em, foo-bar man! &gt;*/</span>
-<span class="special">}</span>
-<span class="comment">//]
-</span></pre>
-<p>
-          The callouts bugs are placed exactly where the special callout comment
-          is situated. It can be anywhere in the code. The bugs can be rather obtrusive,
-          however. They get in the way of the clarity of the code. Another special
-          callout comment style is available:
-        </p>
-<pre class="programlisting"><span class="comment">/*&lt;&lt; some [*quickbook] markup here &gt;&gt;*/</span>
-</pre>
-<p>
-          This is the line-oriented version of the callout. With this, the "bug"
-          is placed at the very left of the code block, away from the actual code.
-          By placing it at the far left, the code is rendered un-obscured. Example:
-        </p>
-<p>
-          </p>
-<p>
-            
-</p>
-<pre class="programlisting"><span class="keyword">class</span> <span class="identifier">x</span>
-<span class="special">{</span>
-<span class="keyword">public</span><span class="special">:</span>
-
-    <span class="line_callout_bug"><a class="co" name="quickbook2co" href="block.html#quickbook2"><img src="../../images/callouts/1.png" alt="1" border="0"></a></span><span class="identifier">x</span><span class="special">()</span> <span class="special">:</span> <span class="identifier">n</span><span class="special">(</span><span class="number">0</span><span class="special">)</span>
-    <span class="special">{</span>
-    <span class="special">}</span>
-
-    <span class="line_callout_bug"><a class="co" name="quickbook3co" href="block.html#quickbook3"><img src="../../images/callouts/2.png" alt="2" border="0"></a></span><span class="special">~</span><span class="identifier">x</span><span class="special">()</span>
-    <span class="special">{</span>
-    <span class="special">}</span>
-
-    <span class="line_callout_bug"><a class="co" name="quickbook4co" href="block.html#quickbook4"><img src="../../images/callouts/3.png" alt="3" border="0"></a></span><span class="keyword">int</span> <span class="identifier">get</span><span class="special">()</span> <span class="keyword">const</span>
-    <span class="special">{</span>
-        <span class="keyword">return</span> <span class="identifier">n</span><span class="special">;</span> 
-    <span class="special">}</span>
-
-    <span class="line_callout_bug"><a class="co" name="quickbook5co" href="block.html#quickbook5"><img src="../../images/callouts/4.png" alt="4" border="0"></a></span><span class="keyword">void</span> <span class="identifier">set</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">n_</span><span class="special">)</span>
-    <span class="special">{</span>
-        <span class="identifier">n</span> <span class="special">=</span> <span class="identifier">n_</span><span class="special">;</span>
-    <span class="special">}</span>
-<span class="special">};</span>
-</pre>
-<p>
-          </p>
-<p>
-          </p>
-<p>
-            </p>
-<div class="calloutlist"><table border="0" summary="Callout list">
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="quickbook2"></a>
 </p></td>
-<td valign="top" align="left"><p> Constructor </p></td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="quickbook3"></a>
 </p></td>
-<td valign="top" align="left"><p> Destructor </p></td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="quickbook4"></a>
 </p></td>
-<td valign="top" align="left"><p> Get the <code class="computeroutput"><span class="identifier">n</span></code>
-            member variable </p></td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><p><a name="quickbook5"></a>
 </p></td>
-<td valign="top" align="left"><p> Set the <code class="computeroutput"><span class="identifier">n</span></code>
-            member variable </p></td>
-</tr>
-</table></div>
-<p>
-          </p>
-<p>
-        </p>
-<p>
-          See the actual code here: ../../test/stub.cpp
-        </p>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 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 http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="phrase.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.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="../install.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/proto/v4/tools/quickbook/doc/html/quickbook/syntax/comments.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/quickbook/syntax/comments.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,53 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Comments</title>
-<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../syntax.html" title="Syntax Summary">
-<link rel="prev" href="../syntax.html" title="Syntax Summary">
-<link rel="next" href="phrase.html" title="Phrase Level Elements">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../syntax.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.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="phrase.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.syntax.comments"></a><a class="link" href="comments.html" title="Comments">Comments</a>
-</h3></div></div></div>
-<p>
-        Can be placed anywhere.
-      </p>
-<pre class="programlisting">[/ comment (no output generated) ]
-</pre>
-<pre class="programlisting">[/ comments can be nested [/ some more here] ]
-</pre>
-<pre class="programlisting">[/ Quickbook blocks can nest inside comments. [*Comment this out too!] ]
-</pre>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 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 http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="../syntax.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.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="phrase.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/proto/v4/tools/quickbook/doc/html/quickbook/syntax/phrase.html
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/html/quickbook/syntax/phrase.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
+++ (empty file)
@@ -1,866 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Phrase Level Elements</title>
-<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../syntax.html" title="Syntax Summary">
-<link rel="prev" href="comments.html" title="Comments">
-<link rel="next" href="block.html" title="Block Level Elements">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="comments.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.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="block.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.syntax.phrase"></a><a class="link" href="phrase.html" title="Phrase Level Elements"> Phrase Level Elements</a>
-</h3></div></div></div>
-<div class="toc"><dl>
-<dt><span class="section">Font Styles</span></dt>
-<dt><span class="section">Replaceable</span></dt>
-<dt><span class="section">Quotations</span></dt>
-<dt><span class="section">Simple formatting</span></dt>
-<dt><span class="section">Inline code</span></dt>
-<dt><span class="section">Code blocks</span></dt>
-<dt><span class="section">Source Mode</span></dt>
-<dt><span class="section">line-break</span></dt>
-<dt><span class="section">Anchors</span></dt>
-<dt><span class="section">Links</span></dt>
-<dt><span class="section">Anchor links</span></dt>
-<dt><span class="section">refentry links</span></dt>
-<dt><span class="section"> Code Links</span></dt>
-<dt><span class="section">Escape</span></dt>
-<dt><span class="section"><a href="phrase.html#quickbook.syntax.phrase.single_char_escape">Single
-        char escape</a></span></dt>
-<dt><span class="section">Images</span></dt>
-<dt><span class="section">Footnotes</span></dt>
-<dt><span class="section"> Conditional Generation</span></dt>
-</dl></div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.font_styles"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.font_styles" title="Font Styles">Font Styles</a>
-</h4></div></div></div>
-<pre class="programlisting">['italic], [*bold], [_underline], [^teletype], [-strikethrough]
-</pre>
-<p>
-          will generate:
-        </p>
-<p>
-          <span class="emphasis"><em>italic</em></span>, <span class="bold"><strong>bold</strong></span>, <span class="underline">underline</span>, <code class="literal">teletype</code>, <span class="strikethrough">strikethrough</span>
-        </p>
-<p>
-          Like all non-terminal phrase level elements, this can of course be nested:
-        </p>
-<pre class="programlisting">[*['bold-italic]]
-</pre>
-<p>
-          will generate:
-        </p>
-<p>
-          <span class="bold"><strong><span class="emphasis"><em>bold-italic</em></span></strong></span>
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.replaceable"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.replaceable" title="Replaceable">Replaceable</a>
-</h4></div></div></div>
-<p>
-          When you want content that may or must be replaced by the user, use the
-          syntax:
-        </p>
-<pre class="programlisting">[~replacement]
-</pre>
-<p>
-          This will generate:
-        </p>
-<p>
-          <em class="replaceable"><code>
-            replacement
-          </code></em>
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.quotations"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.quotations" title="Quotations">Quotations</a>
-</h4></div></div></div>
-<pre class="programlisting">["A question that sometimes drives me hazy: am I or are the others crazy?]--Einstein
-</pre>
-<p>
-          will generate:
-        </p>
-<p>
-          &#8220;<span class="quote">A question that sometimes drives me hazy: am I or are the others
-          crazy?</span>&#8221;--Einstein
-        </p>
-<p>
-          Note the proper left and right quote marks. Also, while you can simply
-          use ordinary quote marks like "quoted", our quotation, above,
-          will generate correct DocBook quotations (e.g. &lt;quote&gt;quoted&lt;/quote&gt;).
-        </p>
-<p>
-          Like all phrase elements, quotations may be nested. Example:
-        </p>
-<pre class="programlisting">["Here's the rule for bargains: ["Do other men, for they would do you.] That's
-the true business precept.]
-</pre>
-<p>
-          will generate:
-        </p>
-<p>
-          &#8220;<span class="quote">Here's the rule for bargains: &#8216;<span class="quote">Do other men, for they would
-          do you.</span>&#8217; That's the true business precept.</span>&#8221;
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.simple_formatting"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple formatting</a>
-</h4></div></div></div>
-<p>
-          Simple markup for formatting text, common in many applications, is now
-          supported:
-        </p>
-<pre class="programlisting">/italic/, *bold*, _underline_, =teletype=
-</pre>
-<p>
-          will generate:
-        </p>
-<p>
-          <span class="emphasis"><em>italic</em></span>, <span class="bold"><strong>bold</strong></span>, <span class="underline">underline</span>, <code class="literal">teletype</code>
-        </p>
-<p>
-          Unlike QuickBook's standard formatting scheme, the rules for simpler alternatives
-          are much stricter
-          <sup>[<a name="id4913148" href="#ftn.id4913148" class="footnote">1</a>]</sup>
-          .
-        </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-            Simple markups cannot nest. You can combine a simple markup with a nestable
-            markup.
-          </li>
-<li>
-            Simple markups cannot contain any other form of quickbook markup.
-          </li>
-<li>
-            A non-space character must follow the leading markup
-          </li>
-<li>
-            A non-space character must precede the trailing markup
-          </li>
-<li>
-            A space or a punctuation must follow the trailing markup
-          </li>
-<li>
-            If the matching markup cannot be found within a block, the formatting
-            will not be applied. This is to ensure that un-matched formatting markups,
-            which can be a common mistake, does not corrupt anything past a single
-            block. We do not want the rest of the document to be rendered bold just
-            because we forgot a trailing '*'. A single block is terminated by two
-            end of lines or the close bracket: ']'.
-          </li>
-<li>
-            A line starting with the star will be interpreted as an unordered list.
-            See <a class="link" href="block.html#quickbook.syntax.block.lists.unordered_lists" title="Unordered lists">Unordered
-            lists</a>.
-          </li>
-</ul></div>
-<div class="table">
-<a name="id4913229"></a><p class="title"><b>Table 1. More Formatting Samples</b></p>
-<div class="table-contents"><table class="table" summary="More Formatting Samples">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-              <p>
-                Markup
-              </p>
-              </th>
-<th>
-              <p>
-                Result
-              </p>
-              </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-              <p>
-                <code class="literal">*Bold*</code>
-              </p>
-              </td>
-<td>
-              <p>
-                <span class="bold"><strong>Bold</strong></span>
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="literal">*Is bold*</code>
-              </p>
-              </td>
-<td>
-              <p>
-                <span class="bold"><strong>Is bold</strong></span>
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="literal">* Not bold* *Not bold * * Not bold *</code>
-              </p>
-              </td>
-<td>
-              <p>
-                * Not bold* *Not bold * * Not bold *
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="literal">This*Isn't*Bold (no bold)</code>
-              </p>
-              </td>
-<td>
-              <p>
-                This*Isn't*Bold (no bold)
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="literal">(*Bold Inside*) (parenthesis not bold)</code>
-              </p>
-              </td>
-<td>
-              <p>
-                (<span class="bold"><strong>Bold Inside</strong></span>) (parenthesis not bold)
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="literal">*(Bold Outside)* (parenthesis bold)</code>
-              </p>
-              </td>
-<td>
-              <p>
-                <span class="bold"><strong>(Bold Outside)</strong></span> (parenthesis bold)
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="literal">3*4*5 = 60 (no bold)</code>
-              </p>
-              </td>
-<td>
-              <p>
-                3*4*5 = 60 (no bold)
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="literal">3 * 4 * 5 = 60 (no bold)</code>
-              </p>
-              </td>
-<td>
-              <p>
-                3 * 4 * 5 = 60 (no bold)
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="literal">3 *4* 5 = 60 (4 is bold)</code>
-              </p>
-              </td>
-<td>
-              <p>
-                3 <span class="bold"><strong>4</strong></span> 5 = 60 (4 is bold)
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="literal">*This is bold* this is not *but this is*</code>
-              </p>
-              </td>
-<td>
-              <p>
-                <span class="bold"><strong>This is bold</strong></span> this is not <span class="bold"><strong>but this is</strong></span>
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="literal">*This is bold*.</code>
-              </p>
-              </td>
-<td>
-              <p>
-                <span class="bold"><strong>This is bold</strong></span>.
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="literal">*B*. (bold B)</code>
-              </p>
-              </td>
-<td>
-              <p>
-                <span class="bold"><strong>B</strong></span>. (bold B)
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="literal">['*Bold-Italic*]</code>
-              </p>
-              </td>
-<td>
-              <p>
-                <span class="emphasis"><em><span class="bold"><strong>Bold-Italic</strong></span></em></span>
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                <code class="literal">*side-by*/-side/</code>
-              </p>
-              </td>
-<td>
-              <p>
-                <span class="bold"><strong>side-by</strong></span><span class="emphasis"><em>-side</em></span>
-              </p>
-              </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><p>
-          As mentioned, simple markups cannot go past a single block. The text from
-          "have" to "full" in the following paragraph will be
-          rendered as bold:
-        </p>
-<pre class="programlisting">Baa baa black sheep, *have you any wool?
-Yes sir, yes sir, three bags full!*
-One for the master, one for the dame,
-And one for the little boy who lives down the lane.
-</pre>
-<p>
-          Baa baa black sheep, <span class="bold"><strong>have you any wool? Yes sir,
-          yes sir, three bags full!</strong></span> One for the master, one for the dame,
-          And one for the little boy who lives down the lane.
-        </p>
-<p>
-          But in the following paragraph, bold is not applied:
-        </p>
-<pre class="programlisting">Baa baa black sheep, *have you any wool?
-Yes sir, yes sir, three bags full!
-One for the master, one for the dame,
-And one for the little boy who lives down the lane.
-</pre>
-<p>
-          Baa baa black sheep, *have you any wool? Yes sir, yes sir, three bags full!
-          One for the master, one for the dame, And one for the little boy who lives
-          down the lane.
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.inline_code"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.inline_code" title="Inline code">Inline code</a>
-</h4></div></div></div>
-<p>
-          Inlining code in paragraphs is quite common when writing C++ documentation.
-          We provide a very simple markup for this. For example, this:
-        </p>
-<pre class="programlisting">This text has inlined code `int main() { return 0; }` in it.
-</pre>
-<p>
-          will generate:
-        </p>
-<p>
-          This text has inlined code <code class="computeroutput"><span class="keyword">int</span> <span class="identifier">main</span><span class="special">()</span> <span class="special">{</span> <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span> <span class="special">}</span></code>
-          in it. The code will be syntax highlighted.
-        </p>
-<div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" 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>
-            We simply enclose the code with the tick: <code class="literal">"`"</code>, not the
-            single quote: <code class="computeroutput"><span class="string">"'"</span></code>.
-            Note too that <code class="literal">`some code`</code> is preferred over <code class="literal">[^some code]</code>.
-          </p></td></tr>
-</table></div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.code_blocks"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.code_blocks" title="Code blocks">Code blocks</a>
-</h4></div></div></div>
-<p>
-          Preformatted code simply starts with a space or a tab (See <a class="link" href="block.html#quickbook.syntax.block.code" title="Code">Code</a>).
-          However, such a simple syntax cannot be used as phrase elements in lists
-          (See <a class="link" href="block.html#quickbook.syntax.block.lists.ordered_lists" title="Ordered lists">Ordered
-          lists</a> and <a class="link" href="block.html#quickbook.syntax.block.lists.unordered_lists" title="Unordered lists">Unordered
-          lists</a>), tables (See <a class="link" href="block.html#quickbook.syntax.block.tables" title="Tables">Tables</a>),
-          etc. Inline code (see above) can. The problem is, inline code does not
-          allow formatting with newlines, spaces, and tabs. These are lost.
-        </p>
-<p>
-          We provide a phrase level markup that is a mix between the two. By using
-          the double-tick, instead of the single-tick, we are telling QuickBook to
-          use preformatted blocks of code. Example:
-        </p>
-<pre class="programlisting">``
-    #include &lt;iostream&gt;
-
-    int main()
-    {
-        std::cout &lt;&lt; "Hello, World!" &lt;&lt; std::endl;
-        return 0;
-    }
-``
-</pre>
-<p>
-          will generate:
-        </p>
-<p>
-          
-</p>
-<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
-
-<span class="keyword">int</span> <span class="identifier">main</span><span class="special">()</span>
-<span class="special">{</span>
-    <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="string">"Hello, World!"</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>
-    <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
-<span class="special">}</span>
-</pre>
-<p>
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.source_mode"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.source_mode" title="Source Mode">Source Mode</a>
-</h4></div></div></div>
-<p>
-          If a document contains more than one type of source code then the source
-          mode may be changed dynamically as the document is processed. All QuickBook
-          documents are initially in C++ mode by default, though an alternative initial
-          value may be set in the <a class="link" href="block.html#quickbook.syntax.block.document" title="Document">Document</a>
-          section.
-        </p>
-<p>
-          To change the source mode, use the <code class="literal">[source-mode]</code> markup,
-          where <code class="literal">source-mode</code> is one of the supported modes. For
-          example, this:
-        </p>
-<pre class="programlisting">Python's [python] `import` is rather like C++'s [c++] `#include`. A
-C++ comment `// looks like this` whereas a Python comment [python]
-`# looks like this`.
-</pre>
-<p>
-          will generate:
-        </p>
-<p>
-          Python's <code class="computeroutput"><span class="keyword">import</span></code> is rather
-          like C++'s <code class="computeroutput"><span class="preprocessor">#include</span></code>.
-          A C++ comment <code class="computeroutput"><span class="comment">// looks like this</span></code>
-          whereas a Python comment <code class="computeroutput"><span class="comment">#looks like this</span></code>.
-        </p>
-<div class="table">
-<a name="id4904787"></a><p class="title"><b>Table 2. Supported Source Modes</b></p>
-<div class="table-contents"><table class="table" summary="Supported Source Modes">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-              <p>
-                Mode
-              </p>
-              </th>
-<th>
-              <p>
-                Source Mode Markup
-              </p>
-              </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-              <p>
-                C++
-              </p>
-              </td>
-<td>
-              <p>
-                <code class="literal">[c++]</code>
-              </p>
-              </td>
-</tr>
-<tr>
-<td>
-              <p>
-                Python
-              </p>
-              </td>
-<td>
-              <p>
-                <code class="literal">[python]</code>
-              </p>
-              </td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="note"><table border="0" summary="Note">
-<tr>
-<td rowspan="2" align="center" 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>
-            The source mode strings are lowercase.
-          </p></td></tr>
-</table></div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.line_break"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.line_break" title="line-break">line-break</a>
-</h4></div></div></div>
-<pre class="programlisting">[br]
-</pre>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../doc/html/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            <code class="computeroutput"><span class="special">[</span><span class="identifier">br</span><span class="special">]</span></code> is now deprecated. <a class="link" href="block.html#quickbook.syntax.block.blurbs" title="Blurbs">Blurbs</a>,
-            <a class="link" href="block.html#quickbook.syntax.block.admonitions" title="Admonitions">Admonitions</a>
-            and table cells (see <a class="link" href="block.html#quickbook.syntax.block.tables" title="Tables">Tables</a>)
-            may now contain paragraphs.
-          </p></td></tr>
-</table></div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.anchors"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.anchors" title="Anchors">Anchors</a>
-</h4></div></div></div>
-<pre class="programlisting">[#named_anchor]
-</pre>
-<p>
-          A named anchor is a hook that can be referenced by a link elsewhere in
-          the document. You can then reference an anchor with <code class="literal">[link named_anchor
-Some link text]</code>.
-          See <a class="link" href="phrase.html#quickbook.syntax.phrase.anchor_links" title="Anchor links">Anchor links</a>,
-          <a class="link" href="block.html#quickbook.syntax.block.section" title="Section">Section</a> and <a class="link" href="block.html#quickbook.syntax.block.headings" title="Headings">Heading</a>.
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.links"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.links" title="Links">Links</a>
-</h4></div></div></div>
-<pre class="programlisting">[@http://www.boost.org this is [*boost's] website....]
-</pre>
-<p>
-          will generate:
-        </p>
-<p>
-          <a href="http://www.boost.org" target="_top">this is <span class="bold"><strong>boost's</strong></span>
-          website....</a>
-        </p>
-<p>
-          URL links where the link text is the link itself is common. Example:
-        </p>
-<pre class="programlisting">see http://spirit.sourceforge.net/
-</pre>
-<p>
-          so, when the text is absent in a link markup, the URL is assumed. Example:
-        </p>
-<pre class="programlisting">see [@http://spirit.sourceforge.net/]
-</pre>
-<p>
-          will generate:
-        </p>
-<p>
-          see http://spirit.sourceforge.net/
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.anchor_links"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.anchor_links" title="Anchor links">Anchor links</a>
-</h4></div></div></div>
-<p>
-          You can link within a document using:
-        </p>
-<pre class="programlisting">[link section_id.normalized_header_text The link text]
-</pre>
-<p>
-          See sections <a class="link" href="block.html#quickbook.syntax.block.section" title="Section">Section</a>
-          and <a class="link" href="block.html#quickbook.syntax.block.headings" title="Headings">Heading</a> for
-          more info.
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.refentry_links"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.refentry_links" title="refentry links">refentry links</a>
-</h4></div></div></div>
-<p>
-          In addition, you can link internally to an XML refentry like:
-        </p>
-<pre class="programlisting">[link xml.refentry The link text]
-</pre>
-<p>
-          This gets converted into <code class="literal">&lt;link linkend="xml.refentry"&gt;The
-          link text&lt;/link&gt;</code>.
-        </p>
-<p>
-          Like URLs, the link text is optional. If this is not present, the link
-          text will automatically be the refentry. Example:
-        </p>
-<pre class="programlisting">[link xml.refentry]
-</pre>
-<p>
-          This gets converted into <code class="literal">&lt;link linkend="xml.refentry"&gt;xml.refentry&lt;/link&gt;</code>.
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.code_links"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.code_links" title="Code Links"> Code Links</a>
-</h4></div></div></div>
-<p>
-          If you want to link to a function, class, member, enum, concept, global,
-          or header in the reference section, you can use:
-        </p>
-<pre class="programlisting">[funcref fully::qualified::function_name The link text]
-[classref fully::qualified::class_name The link text]
-[memberref fully::qualified::member_name The link text]
-[enumref fully::qualified::enum_name The link text]
-[macroref MACRO_NAME The link text]
-[conceptref ConceptName The link text]
-[headerref path/to/header.hpp The link text]
-[globalref fully::qualified::global The link text]
-</pre>
-<p>
-          Again, the link text is optional. If this is not present, the link text
-          will automatically be the function, class, member, enum, macro, concept,
-          global, or header name. Example:
-        </p>
-<pre class="programlisting">[classref boost::bar::baz]
-</pre>
-<p>
-          would have "boost::bar::baz" as the link text.
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.escape"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.escape" title="Escape">Escape</a>
-</h4></div></div></div>
-<p>
-          The escape mark-up is used when we don't want to do any processing.
-        </p>
-<pre class="programlisting">'''
-escape (no processing/formatting)
-'''
-</pre>
-<p>
-          Escaping allows us to pass XML markup to BoostBook
-          or DocBook. For example:
-        </p>
-<pre class="programlisting">'''
-&lt;emphasis role="bold"&gt;This is direct XML markup&lt;/emphasis&gt;
-'''
-</pre>
-<p>
-          <span class="bold"><strong>This is direct XML markup</strong></span>
-        </p>
-<div class="important"><table border="0" summary="Important">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="../../../../../../doc/html/images/important.png"></td>
-<th align="left">Important</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            Be careful when using the escape. The text must conform to BoostBook/DocBook syntax.
-          </p></td></tr>
-</table></div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.single_char_escape"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.single_char_escape" title="Single char escape">Single
-        char escape</a>
-</h4></div></div></div>
-<p>
-          The backslash may be used to escape a single punctuation character. The
-          punctuation immediately after the backslash is passed without any processing.
-          This is useful when we need to escape QuickBook punctuations such as <code class="computeroutput"><span class="special">[</span></code> and <code class="computeroutput"><span class="special">]</span></code>.
-          For example, how do you escape the triple quote? Simple: <code class="literal">\'\'\'</code>
-        </p>
-<p>
-          <code class="computeroutput"><span class="special">\</span><span class="identifier">n</span></code>
-          has a special meaning. It is used to generate line breaks.
-        </p>
-<div class="warning"><table border="0" summary="Warning">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../doc/html/images/warning.png"></td>
-<th align="left">Warning</th>
-</tr>
-<tr><td align="left" valign="top"><p>
-            <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. <a class="link" href="block.html#quickbook.syntax.block.blurbs" title="Blurbs">Blurbs</a>,
-            <a class="link" href="block.html#quickbook.syntax.block.admonitions" title="Admonitions">Admonitions</a>
-            and table cells (see <a class="link" href="block.html#quickbook.syntax.block.tables" title="Tables">Tables</a>)
-            may now contain paragraphs.
-          </p></td></tr>
-</table></div>
-<p>
-          The escaped space: <code class="computeroutput"><span class="special">\</span> </code> also
-          has a special meaning. The escaped space is removed from the output.
-        </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.images"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.images" title="Images">Images</a>
-</h4></div></div></div>
-<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="phrase.html#quickbook.syntax.phrase.footnotes" title="Footnotes">Footnotes</a>
-</h4></div></div></div>
-<div class="toc"><dl>
-<dt><span class="section"><a href="phrase.html#quickbook.syntax.phrase.footnotes.macro_expansion">Macro
-          Expansion</a></span></dt>
-<dt><span class="section"><a href="phrase.html#quickbook.syntax.phrase.footnotes.template_expansion">Template
-          Expansion</a></span></dt>
-</dl></div>
-<p>
-          As of version 1.3, QuickBook supports footnotes. Just put the text of the
-          footnote in a <code class="computeroutput"><span class="special">[</span><span class="identifier">footnote</span><span class="special">]</span></code> block, and the text will be put at the
-          bottom of the current page. For example, this:
-        </p>
-<pre class="programlisting">[footnote A sample footnote]
-</pre>
-<p>
-          will generate this
-          <sup>[<a name="id4905586" href="#ftn.id4905586" class="footnote">2</a>]</sup>
-          .
-        </p>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="quickbook.syntax.phrase.footnotes.macro_expansion"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.footnotes.macro_expansion" title="Macro Expansion">Macro
-          Expansion</a>
-</h5></div></div></div>
-<pre class="programlisting">__a_macro_identifier__
-</pre>
-<p>
-            See <a class="link" href="block.html#quickbook.syntax.block.macros" title="Macros">Macros</a> for details.
-          </p>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="quickbook.syntax.phrase.footnotes.template_expansion"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.footnotes.template_expansion" title="Template Expansion">Template
-          Expansion</a>
-</h5></div></div></div>
-<pre class="programlisting">[a_template_identifier]
-</pre>
-<p>
-            See <a class="link" href="block.html#quickbook.syntax.block.templates" title="Templates">Templates</a>
-            for details.
-          </p>
-</div>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.cond"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.cond" title="Conditional Generation"> Conditional Generation</a>
-</h4></div></div></div>
-<p>
-          Like C++ <code class="computeroutput"><span class="comment">#ifdef</span></code>, you can generate
-          phrases depending on the presence of a macro. Example:
-        </p>
-<pre class="programlisting">[? __to_be__ To be or not to be]
-</pre>
-<p>
-        </p>
-<p>
-          Here, the phrase "To be or not to be" will only be generated
-          if the macro symbol __to_be__ has been previously defined. The phrase above will
-          not do anything since we haven't defined __to_be__. Now, let's define the symbol:
-        </p>
-<pre class="programlisting">[def __to_be__]
-</pre>
-<p>
-          And try again:
-        </p>
-<p>
-          To be or not to be
-        </p>
-<p>
-          Yes!
-          <sup>[<a name="id4905742" href="#ftn.id4905742" class="footnote">3</a>]</sup>
-        </p>
-</div>
-<div class="footnotes">
-<br><hr width="100" align="left">
-<div class="footnote"><p><sup>[<a name="ftn.id4913148" href="#id4913148" class="para">1</a>] </sup>
-              Thanks to David Barrett, author of Qwiki,
-              for sharing these samples and teaching me these obscure formatting
-              rules. I wasn't sure at all if Spirit,
-              being more or less a formal EBNF parser, can handle the context sensitivity
-              and ambiguity.
-            </p></div>
-<div class="footnote"><p><sup>[<a name="ftn.id4905586" href="#id4905586" class="para">2</a>] </sup>
-              A sample footnote
-            </p></div>
-<div class="footnote"><p><sup>[<a name="ftn.id4905742" href="#id4905742" class="para">3</a>] </sup>
-              Conditional Generation makes quickbook turing complete.
-            </p></div>
-</div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 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 http://www.boost.org/LICENSE_1_0.txt)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="comments.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../syntax.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="block.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Modified: branches/proto/v4/tools/quickbook/doc/quickbook.qbk
==============================================================================
--- branches/proto/v4/tools/quickbook/doc/quickbook.qbk	(original)
+++ branches/proto/v4/tools/quickbook/doc/quickbook.qbk	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -84,7 +84,7 @@
 documentation, is autogenerated by QuickBook. These files were generated from
 one master:
 
-[:[@../quickbook.qbk quickbook.qbk]]
+[:[@../../tools/quickbook/doc/quickbook.qbk quickbook.qbk]]
 
 Originally named QuickDoc, this funky tool that never dies, evolved into a
 funkier tool thanks to Eric Niebler who resurrected the project making it
@@ -1661,7 +1661,8 @@
 [import ../test/stub.cpp]
 ''']
 
-collects specially marked-up code snippets from [@../../test/stub.cpp stub.cpp]
+collects specially marked-up code snippets from
+[@../../tools/quickbook/test/stub.cpp stub.cpp]
 and places them in your QuickBook file as virtual templates. Each of the
 specially marked-up code snippets has a name (e.g. `foo` and `bar` in the
 example above). This shall be the template identifier for that particular code
@@ -1680,8 +1681,8 @@
 
 [heading Code Snippet Markup]
 
-Note how the code snippets in [@../../test/stub.cpp stub.cpp] get marked up. We
-use distinguishable comments following the form:
+Note how the code snippets in [@../../tools/quickbook/test/stub.cpp stub.cpp]
+get marked up. We use distinguishable comments following the form:
 
     //[id
     some code here
@@ -1763,7 +1764,7 @@
 
 [class_]
 
-See the actual code here: [@../../test/stub.cpp]
+See the actual code here: [@../../tools/quickbook/test/stub.cpp]
 
 [endsect]
 

Modified: branches/proto/v4/tools/quickbook/extra/katepart/katepart.qbk
==============================================================================
--- branches/proto/v4/tools/quickbook/extra/katepart/katepart.qbk	(original)
+++ branches/proto/v4/tools/quickbook/extra/katepart/katepart.qbk	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -18,10 +18,10 @@
 
 [variablelist
 [[.qbk loaded in a text editor][
-[$images/extra/katepart/table.text.editor.png]
+[$../../tools/quickbook/doc/html/images/extra/katepart/table.text.editor.png]
 ]]
 [[.qbk loaded with boost::hs support][
-[$images/extra/katepart/table.boost.hs.png]
+[$../../tools/quickbook/doc/html/images/extra/katepart/table.boost.hs.png]
 ]]
 ]
 
@@ -93,7 +93,7 @@
 
 [heading About boost::hs]
 
-[$images/extra/katepart/boost.hs.logo.png]
+[$../../tools/quickbook/doc/html/images/extra/katepart/boost.hs.logo.png]
 
 boost::hs::quickbook is a component of boost::hs, a syntax highlighting
 for C++, doxygen, Boost.Build jamfiles and QuickBook.

Modified: branches/proto/v4/tools/quickbook/index.html
==============================================================================
--- branches/proto/v4/tools/quickbook/index.html	(original)
+++ branches/proto/v4/tools/quickbook/index.html	2008-10-04 21:47:33 EDT (Sat, 04 Oct 2008)
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
-    <meta http-equiv="refresh" content="0; URL=doc/html/index.html">
+    <meta http-equiv="refresh" content="0; URL=../../doc/html/quickbook.html">
   </head>
   <body>
     Automatic redirection failed, click this 
-    link
+    link
   </body>
 </html>