HP aCC patches.

[SVN r23169]
Fixed bug with grepping for literals.
2025-12-19 05:12:38 +01:00 · 2004-06-23 12:44:17 +00:00 · 2004-06-12 10:10:07 +00:00 · 2004-06-09 12:12:42 +00:00 · 2004-06-09 12:12:01 +00:00 · 2004-06-09 11:23:52 +00:00
42 changed files with 1552 additions and 1782 deletions
--- a/build/gcc.mak
+++ b/build/gcc.mak
@@ -18,6 +18,7 @@
 # compiler:
 CXX=g++
 LINKER=g++ -shared
 AR=ar
 #
 # compiler options for release build:
@@ -94,8 +95,8 @@ boost_regex-gcc-1_31_clean :
 	rm -f gcc/boost_regex-gcc-1_31/*.o
 ./gcc/libboost_regex-gcc-1_31.a : gcc/boost_regex-gcc-1_31/c_regex_traits.o gcc/boost_regex-gcc-1_31/c_regex_traits_common.o gcc/boost_regex-gcc-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-1_31/cregex.o gcc/boost_regex-gcc-1_31/fileiter.o gcc/boost_regex-gcc-1_31/instances.o gcc/boost_regex-gcc-1_31/posix_api.o gcc/boost_regex-gcc-1_31/regex.o gcc/boost_regex-gcc-1_31/regex_debug.o gcc/boost_regex-gcc-1_31/regex_synch.o gcc/boost_regex-gcc-1_31/w32_regex_traits.o gcc/boost_regex-gcc-1_31/wide_posix_api.o gcc/boost_regex-gcc-1_31/winstances.o
-	ar -r gcc/libboost_regex-gcc-1_31.a  gcc/boost_regex-gcc-1_31/c_regex_traits.o gcc/boost_regex-gcc-1_31/c_regex_traits_common.o gcc/boost_regex-gcc-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-1_31/cregex.o gcc/boost_regex-gcc-1_31/fileiter.o gcc/boost_regex-gcc-1_31/instances.o gcc/boost_regex-gcc-1_31/posix_api.o gcc/boost_regex-gcc-1_31/regex.o gcc/boost_regex-gcc-1_31/regex_debug.o gcc/boost_regex-gcc-1_31/regex_synch.o gcc/boost_regex-gcc-1_31/w32_regex_traits.o gcc/boost_regex-gcc-1_31/wide_posix_api.o gcc/boost_regex-gcc-1_31/winstances.o
+	$(AR) -r gcc/libboost_regex-gcc-1_31.a  gcc/boost_regex-gcc-1_31/c_regex_traits.o gcc/boost_regex-gcc-1_31/c_regex_traits_common.o gcc/boost_regex-gcc-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-1_31/cregex.o gcc/boost_regex-gcc-1_31/fileiter.o gcc/boost_regex-gcc-1_31/instances.o gcc/boost_regex-gcc-1_31/posix_api.o gcc/boost_regex-gcc-1_31/regex.o gcc/boost_regex-gcc-1_31/regex_debug.o gcc/boost_regex-gcc-1_31/regex_synch.o gcc/boost_regex-gcc-1_31/w32_regex_traits.o gcc/boost_regex-gcc-1_31/wide_posix_api.o gcc/boost_regex-gcc-1_31/winstances.o
-	-ar -s gcc/libboost_regex-gcc-1_31.a
+	-$(AR) -s gcc/libboost_regex-gcc-1_31.a
 ########################################################
 #
@@ -148,6 +149,6 @@ boost_regex-gcc-d-1_31_clean :
 	rm -f gcc/boost_regex-gcc-d-1_31/*.o
 ./gcc/libboost_regex-gcc-d-1_31.a : gcc/boost_regex-gcc-d-1_31/c_regex_traits.o gcc/boost_regex-gcc-d-1_31/c_regex_traits_common.o gcc/boost_regex-gcc-d-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31/cregex.o gcc/boost_regex-gcc-d-1_31/fileiter.o gcc/boost_regex-gcc-d-1_31/instances.o gcc/boost_regex-gcc-d-1_31/posix_api.o gcc/boost_regex-gcc-d-1_31/regex.o gcc/boost_regex-gcc-d-1_31/regex_debug.o gcc/boost_regex-gcc-d-1_31/regex_synch.o gcc/boost_regex-gcc-d-1_31/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31/wide_posix_api.o gcc/boost_regex-gcc-d-1_31/winstances.o
-	ar -r gcc/libboost_regex-gcc-d-1_31.a  gcc/boost_regex-gcc-d-1_31/c_regex_traits.o gcc/boost_regex-gcc-d-1_31/c_regex_traits_common.o gcc/boost_regex-gcc-d-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31/cregex.o gcc/boost_regex-gcc-d-1_31/fileiter.o gcc/boost_regex-gcc-d-1_31/instances.o gcc/boost_regex-gcc-d-1_31/posix_api.o gcc/boost_regex-gcc-d-1_31/regex.o gcc/boost_regex-gcc-d-1_31/regex_debug.o gcc/boost_regex-gcc-d-1_31/regex_synch.o gcc/boost_regex-gcc-d-1_31/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31/wide_posix_api.o gcc/boost_regex-gcc-d-1_31/winstances.o
+	$(AR) -r gcc/libboost_regex-gcc-d-1_31.a  gcc/boost_regex-gcc-d-1_31/c_regex_traits.o gcc/boost_regex-gcc-d-1_31/c_regex_traits_common.o gcc/boost_regex-gcc-d-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31/cregex.o gcc/boost_regex-gcc-d-1_31/fileiter.o gcc/boost_regex-gcc-d-1_31/instances.o gcc/boost_regex-gcc-d-1_31/posix_api.o gcc/boost_regex-gcc-d-1_31/regex.o gcc/boost_regex-gcc-d-1_31/regex_debug.o gcc/boost_regex-gcc-d-1_31/regex_synch.o gcc/boost_regex-gcc-d-1_31/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31/wide_posix_api.o gcc/boost_regex-gcc-d-1_31/winstances.o
-	-ar -s gcc/libboost_regex-gcc-d-1_31.a
+	-$(AR) -s gcc/libboost_regex-gcc-d-1_31.a
--- a/doc/Attic/captures.html
+++ b/doc/Attic/captures.html
@@ -24,6 +24,11 @@
      </P>
      <HR>
      <p></p>
      <P>Captures are the iterator ranges that are "captured" by marked sub-expressions 
         as a regular expression gets matched.&nbsp; Each marked sub-expression can 
         result in more than one capture, if it is matched more than once.&nbsp; This 
         document explains how captures and marked sub-expressions in Boost.Regex are 
         represented and accessed.</P>
      <H2>Marked sub-expressions</H2>
      <P>Every time a Perl regular expression contains a parenthesis group (), it spits 
         out an extra field, known as a marked sub-expression, for example the 
@@ -247,4 +252,3 @@ Text:        "now is the time for all good men to come to the aid of the party"
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
   </body>
 </html>
--- a/doc/Attic/contacts.html
+++ b/doc/Attic/contacts.html
@@ -25,25 +25,32 @@
      <BR>
      <BR>
      <HR>
-      <P>The author can be contacted at john@johnmaddock.co.uk;&nbsp;the 
+      <P>The author can be contacted at john@johnmaddock.co.uk;&nbsp;the home page for 
-         home page for this library is at <A href="http://www.boost.org">www.boost.org</A>.</P>
+         this library is at <A href="http://www.boost.org">www.boost.org</A>.</P>
-      <P>I am indebted to Robert Sedgewick's "Algorithms in C++" for forcing me to think 
+      <P>I am indebted to <A href="http://www.cs.princeton.edu/~rs/">Robert Sedgewick's 
-         about algorithms and their performance, and to the folks at boost for forcing 
+            "Algorithms in C++" </A>for forcing me to think about algorithms and their 
-         me to <I>think</I>, period. The following people have all contributed useful 
+         performance, and to the folks at <A href="http://www.boost.org">boost</A> for 
-         comments or fixes: Dave Abrahams, Mike Allison, Edan Ayal, Jayashree 
+         forcing me to <I>think</I>, period.</P>
-         Balasubramanian, Jan B<>lsche, Beman Dawes, Paul Baxter, David Bergman, David 
+      <P><A href="http://www.boost-consulting.com">Eric Niebler</A>, author of the <A href="http://research.microsoft.com/projects/greta">
-         Dennerline, Edward Diener, Peter Dimov, Robert Dunn, Fabio Forno, Tobias 
+            GRETA regular expression component</A>, has shared several important ideas, 
-         Gabrielsson, Rob Gillen, Marc Gregoire, Chris Hecker, Nick Hodapp, Jesse Jones, 
+         in a series of long discussions.</P>
-         Martin Jost, Boris Krasnovskiy, Jan Hermelink, Max Leung, Wei-hao Lin, Jens 
+      <P>Pete Becker, of <A href="http://www.dinkumware.com/">Dinkumware Ltd</A>, has 
-         Maurer, Richard Peters, Heiko Schmidt, Jason Shirk, Gerald Slacik, Scobie 
+         helped enormously with the standardisation proposal language.</P>
-         Smith, Mike Smyth, Alexander Sokolovsky, Herv<72> Poirier, Michael Raykh, Marc 
+      <P>The following people have all contributed useful comments or fixes: Dave 
-         Recht, Scott VanCamp, Bruno Voigt, Alexey Voinov, Jerry Waldorf, Rob Ward, 
+         Abrahams, Mike Allison, Edan Ayal, Jayashree Balasubramanian, Jan B<>lsche, 
-         Lealon Watts, Thomas Witt and Yuval Yosef. I am also grateful to the manuals 
+         Beman Dawes, Paul Baxter, David Bergman, David Dennerline, Edward Diener, Peter 
-         supplied with the Henry Spencer, Perl and GNU regular expression libraries - 
+         Dimov, Robert Dunn, Fabio Forno, Tobias Gabrielsson, Rob Gillen, Marc Gregoire, 
-         wherever possible I have tried to maintain compatibility with these libraries 
+         Chris Hecker, Nick Hodapp, Jesse Jones, Martin Jost, Boris Krasnovskiy, Jan 
-         and with the POSIX standard - the code however is entirely my own, including 
+         Hermelink, Max Leung, Wei-hao Lin, Jens Maurer, Richard Peters, Heiko Schmidt, 
-         any bugs! I can absolutely guarantee that I will not fix any bugs I don't know 
+         Jason Shirk, Gerald Slacik, Scobie Smith, Mike Smyth, Alexander Sokolovsky, 
-         about, so if you have any comments or spot any bugs, please get in touch.</P>
+         Herv<EFBFBD> Poirier, Michael Raykh, Marc Recht, Scott VanCamp, Bruno Voigt, Alexey 
         Voinov, Jerry Waldorf, Rob Ward, Lealon Watts, John Wismar, Thomas Witt and 
         Yuval Yosef. I am also grateful to the manuals supplied with the Henry Spencer, 
         Perl and GNU regular expression libraries - wherever possible I have tried to 
         maintain compatibility with these libraries and with the POSIX standard - the 
         code however is entirely my own, including any bugs! I can absolutely guarantee 
         that I will not fix any bugs I don't know about, so if you have any comments or 
         spot any bugs, please get in touch.</P>
      <P>Useful further information can be found at:</P>
      <P>Short&nbsp;tutorials on regular expressions can be <A href="http://etext.lib.virginia.edu/helpsheets/regex.html">
            found here</A> and&nbsp;<A href="http://www.devshed.com/Server_Side/Administration/RegExp/page1.html">here</A>.</P>
@@ -72,8 +79,7 @@
         24 Oct 2003 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
--- a/doc/Attic/faq.html
+++ b/doc/Attic/faq.html
@@ -1,153 +1,114 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
   <head>
 <meta name="generator" content="HTML Tidy, see www.w3.org">
      <title>Boost.Regex: FAQ</title>
-<meta http-equiv="Content-Type" content=
+      <meta name="generator" content="HTML Tidy, see www.w3.org">
-"text/html; charset=iso-8859-1">
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
      <link rel="stylesheet" type="text/css" href="../../../boost.css">
   </head>
   <body>
      <p></p>
-
+      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
 <table id="Table1" cellspacing="1" cellpadding="1" width="100%"
 border="0">
         <tr>
            <td valign="top" width="300">
-<h3><a href="../../../index.htm"><img height="86" width="277" alt=
+               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
 "C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
            </td>
            <td width="353">
               <h1 align="center">Boost.Regex</h1>
               <h2 align="center">FAQ</h2>
            </td>
            <td width="50">
-<h3><a href="index.html"><img height="45" width="43" alt=
+               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
 "Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
            </td>
         </tr>
      </table>
      <br>
      <br>
      <hr>
      <font color="#ff0000"><font color="#ff0000"></font></font>
-<p><font color="#ff0000"><font color="#ff0000"><font color=
+      <p><font color="#ff0000"><font color="#ff0000"><font color="#ff0000">&nbsp;Q. Why can't I 
-"#ff0000">&nbsp;Q. Why can't I use the "convenience" versions of
+                  use the "convenience" versions of regex_match / regex_search / regex_grep / 
-regex_match / regex_search / regex_grep / regex_format /
+                  regex_format / regex_merge?</font></font></font></p>
-regex_merge?</font></font></font></p>
+      <p>A. These versions may or may not be available depending upon the capabilities 
-
+         of your compiler, the rules determining the format of these functions are quite 
-<p>A. These versions may or may not be available depending upon the
+         complex - and only the versions visible to a standard compliant compiler are 
-capabilities of your compiler, the rules determining the format of
+         given in the help. To find out what your compiler supports, run 
-these functions are quite complex - and only the versions visible
+         &lt;boost/regex.hpp&gt; through your C++ pre-processor, and search the output 
-to a standard compliant compiler are given in the help. To find out
+         file for the function that you are interested in.<font color="#ff0000"><font color="#ff0000"></font></font></p>
-what your compiler supports, run &lt;boost/regex.hpp&gt; through
+      <p><font color="#ff0000"><font color="#ff0000">Q. I can't get regex++ to work with 
-your C++ pre-processor, and search the output file for the function
+               escape characters, what's going on?</font></font></p>
-that you are interested in.<font color="#ff0000"><font color=
+      <p>A. If you embed regular expressions in C++ code, then remember that escape 
-"#ff0000"></font></font></p>
+         characters are processed twice: once by the C++ compiler, and once by the 
-
+         regex++ expression compiler, so to pass the regular expression \d+ to regex++, 
-<p><font color="#ff0000"><font color="#ff0000">Q. I can't get
+         you need to embed "\\d+" in your code. Likewise to match a literal backslash 
-regex++ to work with escape characters, what's going
+         you will need to embed "\\\\" in your code. <font color="#ff0000"></font>
-on?</font></font></p>
+      </p>
-
+      <p><font color="#ff0000">Q. Why does using parenthesis in a POSIX regular expression 
-<p>A. If you embed regular expressions in C++ code, then remember
+            change the result of a match?</font></p>
-that escape characters are processed twice: once by the C++
+      <p>For POSIX (extended and basic) regular expressions, but not for perl regexes, 
-compiler, and once by the regex++ expression compiler, so to pass
+         parentheses don't only mark; they determine what the best match is as well. 
-the regular expression \d+ to regex++, you need to embed "\\d+" in
+         When the expression is compiled as a POSIX basic or extended regex then 
-your code. Likewise to match a literal backslash you will need to
+         Boost.regex follows the POSIX standard leftmost longest rule for determining 
-embed "\\\\" in your code. <font color="#ff0000"></font></p>
+         what matched. So if there is more than one possible match after considering the 
-
+         whole expression, it looks next at the first sub-expression and then the second 
-<p><font color="#ff0000">Q. Why does using parenthesis in a POSIX
+         sub-expression and so on. So...</p>
 regular expression change the result of a match?</font></p>
 <p>For POSIX (extended and basic) regular expressions, but not for
 perl regexes, parentheses don't only mark; they determine what the
 best match is as well. When the expression is compiled as a POSIX
 basic or extended regex then Boost.regex follows the POSIX standard
 leftmost longest rule for determining what matched. So if there is
 more than one possible match after considering the whole
 expression, it looks next at the first sub-expression and then the
 second sub-expression and so on. So...</p>
      <pre>
 "(0*)([0-9]*)" against "00123" would produce
 $1 = "00"
 $2 = "123"
 </pre>
      <p>where as</p>
      <pre>
-"0*([0-9)*" against "00123" would produce
+"0*([0-9])*" against "00123" would produce
 $1 = "00123"
 </pre>
-
+      <p>If you think about it, had $1 only matched the "123", this would be "less good" 
-<p>If you think about it, had $1 only matched the "123", this would
+         than the match "00123" which is both further to the left and longer. If you 
-be "less good" than the match "00123" which is both further to the
+         want $1 to match only the "123" part, then you need to use something like:</p>
 left and longer. If you want $1 to match only the "123" part, then
 you need to use something like:</p>
      <pre>
 "0*([1-9][0-9]*)"
 </pre>
      <p>as the expression.</p>
-
+      <p><font color="#ff0000">Q. Why don't character ranges work properly (POSIX mode 
-<p><font color="#ff0000">Q. Why don't character ranges work
+            only)?</font><br>
-properly (POSIX mode only)?</font><br>
+         A. The POSIX standard specifies that character range expressions are locale 
- A. The POSIX standard specifies that character range expressions
+         sensitive - so for example the expression [A-Z] will match any collating 
-are locale sensitive - so for example the expression [A-Z] will
+         element that collates between 'A' and 'Z'. That means that for most locales 
-match any collating element that collates between 'A' and 'Z'. That
+         other than "C" or "POSIX", [A-Z] would match the single character 't' for 
-means that for most locales other than "C" or "POSIX", [A-Z] would
+         example, which is not what most people expect - or at least not what most 
-match the single character 't' for example, which is not what most
+         people have come to expect from regular expression engines. For this reason, 
-people expect - or at least not what most people have come to
+         the default behaviour of boost.regex (perl mode) is to turn locale sensitive 
-expect from regular expression engines. For this reason, the
+         collation off by not setting the regex_constants::collate compile time flag. 
-default behaviour of boost.regex (perl mode) is to turn locale
+         However if you set a non-default compile time flag - for example 
-sensitive collation off by not setting the regex_constants::collate
+         regex_constants::extended or regex_constants::basic, then locale dependent 
-compile time flag. However if you set a non-default compile time
+         collation will be enabled, this also applies to the POSIX API functions which 
-flag - for example regex_constants::extended or
+         use either regex_constants::extended or regex_constants::basic internally. <i>[Note 
-regex_constants::basic, then locale dependent collation will be
+            - when regex_constants::nocollate in effect, the library behaves "as if" the 
-enabled, this also applies to the POSIX API functions which use
+            LC_COLLATE locale category were always "C", regardless of what its actually set 
-either regex_constants::extended or regex_constants::basic
+            to - end note</i>].</p>
-internally. <i>[Note - when regex_constants::nocollate in effect,
+      <p><font color="#ff0000">Q. Why are there no throw specifications on any of the 
-the library behaves "as if" the LC_COLLATE locale category were
+            functions? What exceptions can the library throw?</font></p>
-always "C", regardless of what its actually set to - end
+      <p>A. Not all compilers support (or honor) throw specifications, others support 
-note</i>].</p>
+         them but with reduced efficiency. Throw specifications may be added at a later 
-
+         date as compilers begin to handle this better. The library should throw only 
-<p><font color="#ff0000">Q. Why are there no throw specifications
+         three types of exception: boost::bad_expression can be thrown by basic_regex 
-on any of the functions? What exceptions can the library
+         when compiling a regular expression, std::runtime_error can be thrown when a 
-throw?</font></p>
+         call to basic_regex::imbue tries to open a message catalogue that doesn't 
-
+         exist, or when a call to regex_search or regex_match results in an 
-<p>A. Not all compilers support (or honor) throw specifications,
+         "everlasting" search,&nbsp;or when a call to RegEx::GrepFiles or 
-others support them but with reduced efficiency. Throw
+         RegEx::FindFiles tries to open a file that cannot be opened, finally 
-specifications may be added at a later date as compilers begin to
+         std::bad_alloc can be thrown by just about any of the functions in this 
-handle this better. The library should throw only three types of
+         library.</p>
 exception: boost::bad_expression can be thrown by basic_regex when
 compiling a regular expression, std::runtime_error can be thrown
 when a call to basic_regex::imbue tries to open a message catalogue
 that doesn't exist, or when a call to regex_search or regex_match
 results in an "everlasting" search,&nbsp;or when a call to
 RegEx::GrepFiles or RegEx::FindFiles tries to open a file that
 cannot be opened, finally std::bad_alloc can be thrown by just
 about any of the functions in this library.</p>
      <p></p>
      <hr>
      <p>Revised 
         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
         24 Oct 2003 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
   </body>
 </html>
--- a/doc/Attic/match_flag_type.html
+++ b/doc/Attic/match_flag_type.html
@@ -31,7 +31,7 @@
         character sequence.&nbsp; The behavior of the format flags is descibed in more 
         detail in the <A href="format_syntax.html">format syntax guide</A>.</p>
      <pre>
-namespace std{ namespace regex_constants{
+namespace boost{ namespace regex_constants{
 typedef bitmask_type match_flag_type;
@@ -59,7 +59,7 @@ static const match_flag_type format_first_only;
 static const match_flag_type format_all;
 } // namespace regex_constants
-} // namespace std
+} // namespace boost
 </pre>
      <h3>Description</h3>
      <p>The type <code>match_flag_type</code> is an implementation defined bitmask type 
@@ -271,10 +271,10 @@ static const match_flag_type format_all;
      <br>
      <p>Revised 
         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         04 Feb 2004 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
--- a/doc/Attic/match_results.html
+++ b/doc/Attic/match_results.html
@@ -344,7 +344,7 @@ const_iterator end()const;
      <p><b>Effects:</b> Returns a terminating iterator that enumerates over all the 
         marked sub-expression matches stored in *this.</p>
      <h4><A name="format"></A>match_results reformatting</h4>
-      <pre>template &lt;class OutputIterator&gt;
+      <pre><A name=m12></A>template &lt;class OutputIterator&gt;
 OutputIterator format(OutputIterator out,
                      const string_type&amp; fmt,
                      <A href="match_flag_type.html" >match_flag_type</A> flags = format_default);
--- a/doc/Attic/regex.html
+++ b/doc/Attic/regex.html
@@ -1,55 +1,42 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
   <head>
 <meta name="generator" content="HTML Tidy, see www.w3.org">
      <title>Boost.Regex: class RegEx (deprecated)</title>
-<meta http-equiv="Content-Type" content=
+      <meta name="generator" content="HTML Tidy, see www.w3.org">
-"text/html; charset=iso-8859-1">
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
      <link rel="stylesheet" type="text/css" href="../../../boost.css">
   </head>
   <body>
      <p></p>
-
+      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
 <table id="Table1" cellspacing="1" cellpadding="1" width="100%"
 border="0">
         <tr>
            <td valign="top" width="300">
-<h3><a href="../../../index.htm"><img height="86" width="277" alt=
+               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
 "C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
            </td>
            <td width="353">
               <h1 align="center">Boost.Regex</h1>
               <h2 align="center">class RegEx (deprecated)</h2>
            </td>
            <td width="50">
-<h3><a href="index.html"><img height="45" width="43" alt=
+               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
 "Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
            </td>
         </tr>
      </table>
      <br>
      <br>
      <hr>
-<p>The high level wrapper class RegEx is now deprecated and does
+      <p>The high level wrapper class RegEx is now deprecated and does not form a part 
-not form a part of the <a href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
+         of the <a href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">regular 
-regular expression standardization proposal</a>.&nbsp; This type
+            expression standardization proposal</a>.&nbsp; This type still exists, and 
-still exists, and existing code will continue to compile, however
+         existing code will continue to compile, however the following documentation is 
-the following documentation is unlikely to be further updated.</p>
+         unlikely to be further updated.</p>
      <pre>
 #include &lt;boost/cregex.hpp&gt;
 </pre>
-
+      <p>The class RegEx provides a high level simplified interface to the regular 
-<p>The class RegEx provides a high level simplified interface to
+         expression library, this class only handles narrow character strings, and 
-the regular expression library, this class only handles narrow
+         regular expressions always follow the "normal" syntax - that is the same as the 
-character strings, and regular expressions always follow the
+         perl / ECMAScript synatx.</p>
 "normal" syntax - that is the same as the perl / ECMAScript
 synatx.</p>
      <pre>
 <b>typedef</b> <b>bool</b> (*GrepCallback)(<b>const</b> RegEx&amp; expression);
 <b>typedef</b> <b>bool</b> (*GrepFileCallback)(<b>const</b> <b>char</b>* file, <b>const</b> RegEx&amp; expression);
@@ -72,23 +59,23 @@ synatx.</p>
   <font color="#000080"><i>//
 </i>   <i>// now matching operators:</i> 
   <i>//</i></font> 
-   <b>bool</b> Match(<b>const</b> <b>char</b>* p, <b>unsigned</b> <b>int</b> flags = match_default);
+   <b>bool</b> Match(<b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default);
-   <b>bool</b> Match(<b>const</b> std::string&amp; s, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>bool</b> Match(<b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>bool</b> Search(<b>const</b> <b>char</b>* p, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>bool</b> Search(<b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>bool</b> Search(<b>const</b> std::string&amp; s, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>bool</b> Search(<b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b> <b>char</b>* p, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b> std::string&amp; s, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b> <b>char</b>* p, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b> std::string&amp; s, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned</b> <b>int</b>&gt;&amp; v, <b>const</b> <b>char</b>* p, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned</b> <b>int</b>&gt;&amp; v, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned</b> <b>int</b>&gt;&amp; v, <b>const</b> std::string&amp; s, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned</b> <b>int</b>&gt;&amp; v, <b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   std::string Merge(<b>const</b> std::string&amp; in, <b>const</b> std::string&amp; fmt, <b>bool</b> copy = <b>true</b>, <b>unsigned</b> <b>int</b> flags = match_default); 
+   std::string Merge(<b>const</b> std::string&amp; in, <b>const</b> std::string&amp; fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type flags = match_default); 
-   std::string Merge(<b>const</b> char* in, <b>const</b> char* fmt, <b>bool</b> copy = <b>true</b>, <b>unsigned int</b> flags = match_default); 
+   std::string Merge(<b>const</b> char* in, <b>const</b> char* fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> Split(std::vector&lt;std::string&gt;&amp; v, std::string&amp; s, <b>unsigned</b> flags = match_default, <b>unsigned</b> max_count = ~0); 
+   <b>unsigned</b> Split(std::vector&lt;std::string&gt;&amp; v, std::string&amp; s, boost::match_flag_type flags = match_default, <b>unsigned</b> max_count = ~0); 
   <font color="#000080"><i>// 
 </i>   <i>// now operators for returning what matched in more detail: 
 </i>   <i>// 
@@ -103,509 +90,392 @@ synatx.</p>
   <strong>static const unsigned int</strong> npos;
 };    
 </pre>
      <p>Member functions for class RegEx are defined as follows:<br>
         &nbsp;</p>
      <p></p>
-
+      <table id="Table2" cellspacing="0" cellpadding="7" width="100%" border="0">
 <table id="Table2" cellspacing="0" cellpadding="7" width="100%"
 border="0">
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
            <td valign="top" width="43%">RegEx();</td>
-<td valign="top" width="42%">Default constructor, constructs an
+            <td valign="top" width="42%">Default constructor, constructs an instance of RegEx 
-instance of RegEx without any valid expression.</td>
+               without any valid expression.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
            <td valign="top" width="43%">RegEx(<b>const</b> RegEx&amp; o);</td>
-<td valign="top" width="42%">Copy constructor, all the properties
+            <td valign="top" width="42%">Copy constructor, all the properties of parameter <i>o</i>
-of parameter <i>o</i> are copied.</td>
+               are copied.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">RegEx(<b>const</b> <b>char</b>* c, <b>
+            <td valign="top" width="43%">RegEx(<b>const</b> <b>char</b>* c, <b>bool</b> icase 
-bool</b> icase = <b>false</b>);</td>
+               = <b>false</b>);</td>
-<td valign="top" width="42%">Constructs an instance of RegEx,
+            <td valign="top" width="42%">Constructs an instance of RegEx, setting the 
-setting the expression to <i>c</i>, if <i>icase</i> is <i>true</i>
+               expression to <i>c</i>, if <i>icase</i> is <i>true</i> then matching is 
-then matching is insensitive to case, otherwise it is sensitive to
+               insensitive to case, otherwise it is sensitive to case. Throws <i>bad_expression</i>
-case. Throws <i>bad_expression</i> on failure.</td>
+               on failure.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">RegEx(<b>const</b> std::string&amp; s,
+            <td valign="top" width="43%">RegEx(<b>const</b> std::string&amp; s, <b>bool</b> icase 
-<b>bool</b> icase = <b>false</b>);</td>
+               = <b>false</b>);</td>
-<td valign="top" width="42%">Constructs an instance of RegEx,
+            <td valign="top" width="42%">Constructs an instance of RegEx, setting the 
-setting the expression to <i>s</i>, if <i>icase</i> is <i>true</i>
+               expression to <i>s</i>, if <i>icase</i> is <i>true</i> then matching is 
-then matching is insensitive to case, otherwise it is sensitive to
+               insensitive to case, otherwise it is sensitive to case. Throws <i>bad_expression</i>
-case. Throws <i>bad_expression</i> on failure.</td>
+               on failure.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">RegEx&amp; <b>
+            <td valign="top" width="43%">RegEx&amp; <b>operator</b>=(<b>const</b> RegEx&amp; 
-operator</b>=(<b>const</b> RegEx&amp; o);</td>
+               o);</td>
            <td valign="top" width="42%">Default assignment operator.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">RegEx&amp; <b>
+            <td valign="top" width="43%">RegEx&amp; <b>operator</b>=(<b>const</b> <b>char</b>* 
-operator</b>=(<b>const</b> <b>char</b>* p);</td>
+               p);</td>
-<td valign="top" width="42%">Assignment operator, equivalent to
+            <td valign="top" width="42%">Assignment operator, equivalent to calling <i>SetExpression(p, 
-calling <i>SetExpression(p, false).</i> Throws <i>
+                  false).</i> Throws <i>bad_expression</i> on failure.</td>
 bad_expression</i> on failure.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">RegEx&amp; <b>
+            <td valign="top" width="43%">RegEx&amp; <b>operator</b>=(<b>const</b> std::string&amp; 
-operator</b>=(<b>const</b> std::string&amp; s);</td>
+               s);</td>
-<td valign="top" width="42%">Assignment operator, equivalent to
+            <td valign="top" width="42%">Assignment operator, equivalent to calling <i>SetExpression(s, 
-calling <i>SetExpression(s, false).</i> Throws <i>
+                  false).</i> Throws <i>bad_expression</i> on failure.</td>
 bad_expression</i> on failure.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> SetExpression(<b>constchar</b>* 
-SetExpression(<b>constchar</b>* p, <b>bool</b> icase = <b>
+               p, <b>bool</b> icase = <b>false</b>);</td>
-false</b>);</td>
+            <td valign="top" width="42%">Sets the current expression to <i>p</i>, if <i>icase</i>
-<td valign="top" width="42%">Sets the current expression to <i>
+               is <i>true</i> then matching is insensitive to case, otherwise it is sensitive 
-p</i>, if <i>icase</i> is <i>true</i> then matching is insensitive
+               to case. Throws <i>bad_expression</i> on failure.</td>
 to case, otherwise it is sensitive to case. Throws <i>
 bad_expression</i> on failure.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> SetExpression(<b>const</b> 
-SetExpression(<b>const</b> std::string&amp; s, <b>bool</b> icase =
+               std::string&amp; s, <b>bool</b> icase = <b>false</b>);</td>
-<b>false</b>);</td>
+            <td valign="top" width="42%">Sets the current expression to <i>s</i>, if <i>icase</i>
-<td valign="top" width="42%">Sets the current expression to <i>
+               is <i>true</i> then matching is insensitive to case, otherwise it is sensitive 
-s</i>, if <i>icase</i> is <i>true</i> then matching is insensitive
+               to case. Throws <i>bad_expression</i> on failure.</td>
 to case, otherwise it is sensitive to case. Throws <i>
 bad_expression</i> on failure.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">std::string
+            <td valign="top" width="43%">std::string Expression()<b>const</b>;</td>
-Expression()<b>const</b>;</td>
+            <td valign="top" width="42%">Returns a copy of the current regular expression.</td>
 <td valign="top" width="42%">Returns a copy of the current regular
 expression.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>bool</b> Match(<b>const</b> <b>
+            <td valign="top" width="43%"><b>bool</b> Match(<b>const</b> <b>char</b>* p, 
-char</b>* p, <b>unsigned</b> <b>int</b> flags =
+               boost::match_flag_type flags = match_default);</td>
-match_default);</td>
+            <td valign="top" width="42%">Attempts to match the current expression against the 
-<td valign="top" width="42%">Attempts to match the current
+               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-expression against the text <i>p</i> using the match flags <i>
+                  match flags</a>. Returns <i>true</i> if the expression matches the whole of 
-flags</i> - see <a href="match_flag_type.html">match flags</a>.
+               the input string.</td>
 Returns <i>true</i> if the expression matches the whole of the
 input string.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>bool</b> Match(<b>const</b>
+            <td valign="top" width="43%"><b>bool</b> Match(<b>const</b> std::string&amp; s, 
-std::string&amp; s, <b>unsigned</b> <b>int</b> flags =
+               boost::match_flag_type flags = match_default) ;</td>
-match_default) ;</td>
+            <td valign="top" width="42%">Attempts to match the current expression against the 
-<td valign="top" width="42%">Attempts to match the current
+               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-expression against the text <i>s</i> using the match flags <i>
+                  match flags</a>. Returns <i>true</i> if the expression matches the whole of 
-flags</i> - see <a href="match_flag_type.html">match flags</a>.
+               the input string.</td>
 Returns <i>true</i> if the expression matches the whole of the
 input string.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>bool</b> Search(<b>const</b> <b>
+            <td valign="top" width="43%"><b>bool</b> Search(<b>const</b> <b>char</b>* p, 
-char</b>* p, <b>unsigned</b> <b>int</b> flags =
+               boost::match_flag_type flags = match_default);</td>
-match_default);</td>
+            <td valign="top" width="42%">Attempts to find a match for the current expression 
-<td valign="top" width="42%">Attempts to find a match for the
+               somewhere in the text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-current expression somewhere in the text <i>p</i> using the match
+                  match flags</a>. Returns <i>true</i> if the match succeeds.</td>
 flags <i>flags</i> - see <a href="match_flag_type.html">match
 flags</a>. Returns <i>true</i> if the match succeeds.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>bool</b> Search(<b>const</b>
+            <td valign="top" width="43%"><b>bool</b> Search(<b>const</b> std::string&amp; s, 
-std::string&amp; s, <b>unsigned</b> <b>int</b> flags =
+               boost::match_flag_type flags = match_default) ;</td>
-match_default) ;</td>
+            <td valign="top" width="42%">Attempts to find a match for the current expression 
-<td valign="top" width="42%">Attempts to find a match for the
+               somewhere in the text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-current expression somewhere in the text <i>s</i> using the match
+                  match flags</a>. Returns <i>true</i> if the match succeeds.</td>
 flags <i>flags</i> - see <a href="match_flag_type.html">match
 flags</a>. Returns <i>true</i> if the match succeeds.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b>
-Grep(GrepCallback cb, <b>const</b> <b>char</b>* p, <b>unsigned</b>
+               <b>char</b>* p, boost::match_flag_type flags = match_default);</td>
-<b>int</b> flags = match_default);</td>
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-<td valign="top" width="42%">Finds all matches of the current
+               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-expression in the text <i>p</i> using the match flags <i>flags</i>
+                  match flags</a>. For each match found calls the call-back function <i>cb</i> 
- see <a href="match_flag_type.html">match flags</a>. For each
+               as: cb(*this);
-match found calls the call-back function <i>cb</i> as: cb(*this); 
+               <p>If at any stage the call-back function returns false then the grep operation 
-
+                  terminates, otherwise continues until no further matches are found. Returns the 
-<p>If at any stage the call-back function returns false then the
+                  number of matches found.</p>
 grep operation terminates, otherwise continues until no further
 matches are found. Returns the number of matches found.</p>
            </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b>
-Grep(GrepCallback cb, <b>const</b> std::string&amp; s, <b>
+               std::string&amp; s, boost::match_flag_type flags = match_default);</td>
-unsigned</b> <b>int</b> flags = match_default);</td>
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-<td valign="top" width="42%">Finds all matches of the current
+               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-expression in the text <i>s</i> using the match flags <i>flags</i>
+                  match flags</a>. For each match found calls the call-back function <i>cb</i> 
- see <a href="match_flag_type.html">match flags</a>. For each
+               as: cb(*this);
-match found calls the call-back function <i>cb</i> as: cb(*this); 
+               <p>If at any stage the call-back function returns false then the grep operation 
-
+                  terminates, otherwise continues until no further matches are found. Returns the 
-<p>If at any stage the call-back function returns false then the
+                  number of matches found.</p>
 grep operation terminates, otherwise continues until no further
 matches are found. Returns the number of matches found.</p>
            </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; 
-Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b> <b>
+               v, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default);</td>
-char</b>* p, <b>unsigned</b> <b>int</b> flags =
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-match_default);</td>
+               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-<td valign="top" width="42%">Finds all matches of the current
+                  match flags</a>. For each match pushes a copy of what matched onto <i>v</i>. 
 expression in the text <i>p</i> using the match flags <i>flags</i>
 - see <a href="match_flag_type.html">match flags</a>. For each
 match pushes a copy of what matched onto <i>v</i>. Returns the
 number of matches found.</td>
 <td valign="top" width="7%">&nbsp;</td>
 </tr>
 <tr>
 <td valign="top" width="7%">&nbsp;</td>
 <td valign="top" width="43%"><b>unsigned</b> <b>int</b>
 Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b>
 std::string&amp; s, <b>unsigned</b> <b>int</b> flags =
 match_default);</td>
 <td valign="top" width="42%">Finds all matches of the current
 expression in the text <i>s</i> using the match flags <i>flags</i>
 - see <a href="match_flag_type.html">match flags</a>. For each
 match pushes a copy of what matched onto <i>v</i>. Returns the
 number of matches found.</td>
 <td valign="top" width="7%">&nbsp;</td>
 </tr>
 <tr>
 <td valign="top" width="7%">&nbsp;</td>
 <td valign="top" width="43%"><b>unsigned</b> <b>int</b>
 Grep(std::vector&lt;<b>unsigned int</b>&gt;&amp; v, <b>const</b>
 <b>char</b>* p, <b>unsigned</b> <b>int</b> flags =
 match_default);</td>
 <td valign="top" width="42%">Finds all matches of the current
 expression in the text <i>p</i> using the match flags <i>flags</i>
 - see <a href="match_flag_type.html">match flags</a>. For each
 match pushes the starting index of what matched onto <i>v</i>.
               Returns the number of matches found.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; 
-Grep(std::vector&lt;<b>unsigned int</b>&gt;&amp; v, <b>const</b>
+               v, <b>const</b> std::string&amp; s, boost::match_flag_type flags = 
 std::string&amp; s, <b>unsigned</b> <b>int</b> flags =
               match_default);</td>
-<td valign="top" width="42%">Finds all matches of the current
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-expression in the text <i>s</i> using the match flags <i>flags</i>
+               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
- see <a href="match_flag_type.html">match flags</a>. For each
+                  match flags</a>. For each match pushes a copy of what matched onto <i>v</i>. 
 match pushes the starting index of what matched onto <i>v</i>.
               Returns the number of matches found.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned 
-GrepFiles(GrepFileCallback cb, <b>const</b> <b>char</b>* files, <b>
+                  int</b>&gt;&amp; v, <b>const</b> <b>char</b>* p, boost::match_flag_type 
 bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>int</b> flags =
 match_default);</td>
 <td valign="top" width="42%">Finds all matches of the current
 expression in the files <i>files</i> using the match flags <i>
 flags</i> - see <a href="match_flag_type.html">match flags</a>. For
 each match calls the call-back function cb.&nbsp; 
 <p>If the call-back returns false then the algorithm returns
 without considering further matches in the current file, or any
 further files.&nbsp;</p>
 <p>The parameter <i>files</i> can include wild card characters '*'
 and '?', if the parameter <i>recurse</i> is true then searches
 sub-directories for matching file names.&nbsp;</p>
 <p>Returns the total number of matches found.</p>
 <p>May throw an exception derived from std::runtime_error if file
 io fails.</p>
 </td>
 <td valign="top" width="7%">&nbsp;</td>
 </tr>
 <tr>
 <td valign="top" width="7%">&nbsp;</td>
 <td valign="top" width="43%"><b>unsigned</b> <b>int</b>
 GrepFiles(GrepFileCallback cb, <b>const</b> std::string&amp; files,
 <b>bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>int</b>
               flags = match_default);</td>
-<td valign="top" width="42%">Finds all matches of the current
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-expression in the files <i>files</i> using the match flags <i>
+               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-flags</i> - see <a href="match_flag_type.html">match flags</a>. For
+                  match flags</a>. For each match pushes the starting index of what matched 
-each match calls the call-back function cb.&nbsp; 
+               onto <i>v</i>. Returns the number of matches found.</td>
 <p>If the call-back returns false then the algorithm returns
 without considering further matches in the current file, or any
 further files.&nbsp;</p>
 <p>The parameter <i>files</i> can include wild card characters '*'
 and '?', if the parameter <i>recurse</i> is true then searches
 sub-directories for matching file names.&nbsp;</p>
 <p>Returns the total number of matches found.</p>
 <p>May throw an exception derived from std::runtime_error if file
 io fails.</p>
 </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned 
-FindFiles(FindFilesCallback cb, <b>const</b> <b>char</b>* files,
+                  int</b>&gt;&amp; v, <b>const</b> std::string&amp; s, boost::match_flag_type 
 <b>bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>int</b>
               flags = match_default);</td>
-<td valign="top" width="42%">Searches <i>files</i> to find all
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-those which contain at least one match of the current expression
+               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-using the match flags <i>flags</i> - see <a href="match_flag_type.html">match flags</a>. For each matching file
+                  match flags</a>. For each match pushes the starting index of what matched 
-calls the call-back function cb.&nbsp; 
+               onto <i>v</i>. Returns the number of matches found.</td>
-
+            <td valign="top" width="7%">&nbsp;</td>
-<p>If the call-back returns false then the algorithm returns
+         </tr>
-without considering any further files.&nbsp;</p>
+         <tr>
-
+            <td valign="top" width="7%">&nbsp;</td>
-<p>The parameter <i>files</i> can include wild card characters '*'
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback 
-and '?', if the parameter <i>recurse</i> is true then searches
+               cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, 
-sub-directories for matching file names.&nbsp;</p>
+               boost::match_flag_type flags = match_default);</td>
-
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-<p>Returns the total number of files found.</p>
+               files <i>files</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-
+                  match flags</a>. For each match calls the call-back function cb.&nbsp;
-<p>May throw an exception derived from std::runtime_error if file
+               <p>If the call-back returns false then the algorithm returns without considering 
-io fails.</p>
+                  further matches in the current file, or any further files.&nbsp;</p>
               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
                  parameter <i>recurse</i> is true then searches sub-directories for matching 
                  file names.&nbsp;</p>
               <p>Returns the total number of matches found.</p>
               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
            </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback 
-FindFiles(FindFilesCallback cb, <b>const</b> std::string&amp;
+               cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, 
-files, <b>bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>
+               boost::match_flag_type flags = match_default);</td>
-int</b> flags = match_default);</td>
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-<td valign="top" width="42%">Searches <i>files</i> to find all
+               files <i>files</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-those which contain at least one match of the current expression
+                  match flags</a>. For each match calls the call-back function cb.&nbsp;
-using the match flags <i>flags</i> - see <a href="match_flag_type.html">match flags</a>. For each matching file
+               <p>If the call-back returns false then the algorithm returns without considering 
-calls the call-back function cb.&nbsp; 
+                  further matches in the current file, or any further files.&nbsp;</p>
-
+               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
-<p>If the call-back returns false then the algorithm returns
+                  parameter <i>recurse</i> is true then searches sub-directories for matching 
-without considering any further files.&nbsp;</p>
+                  file names.&nbsp;</p>
-
+               <p>Returns the total number of matches found.</p>
-<p>The parameter <i>files</i> can include wild card characters '*'
+               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
 and '?', if the parameter <i>recurse</i> is true then searches
 sub-directories for matching file names.&nbsp;</p>
 <p>Returns the total number of files found.</p>
 <p>May throw an exception derived from std::runtime_error if file
 io fails.</p>
            </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">std::string Merge(<b>const</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback 
-std::string&amp; in, <b>const</b> std::string&amp; fmt, <b>bool</b>
+               cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, 
-copy = <b>true</b>, <b>unsigned</b> <b>int</b> flags =
+               boost::match_flag_type flags = match_default);</td>
            <td valign="top" width="42%">Searches <i>files</i> to find all those which contain 
               at least one match of the current expression using the match flags <i>flags</i> 
               - see <a href="match_flag_type.html">match flags</a>. For each matching file 
               calls the call-back function cb.&nbsp;
               <p>If the call-back returns false then the algorithm returns without considering 
                  any further files.&nbsp;</p>
               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
                  parameter <i>recurse</i> is true then searches sub-directories for matching 
                  file names.&nbsp;</p>
               <p>Returns the total number of files found.</p>
               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
            </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback 
               cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, 
               boost::match_flag_type flags = match_default);</td>
            <td valign="top" width="42%">Searches <i>files</i> to find all those which contain 
               at least one match of the current expression using the match flags <i>flags</i> 
               - see <a href="match_flag_type.html">match flags</a>. For each matching file 
               calls the call-back function cb.&nbsp;
               <p>If the call-back returns false then the algorithm returns without considering 
                  any further files.&nbsp;</p>
               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
                  parameter <i>recurse</i> is true then searches sub-directories for matching 
                  file names.&nbsp;</p>
               <p>Returns the total number of files found.</p>
               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
            </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
            <td valign="top" width="43%">std::string Merge(<b>const</b> std::string&amp; in, <b>const</b>
               std::string&amp; fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type 
               flags = match_default);</td>
            <td valign="top" width="42%">Performs a search and replace operation: searches 
               through the string <i>in</i> for all occurrences of the current expression, for 
               each occurrence replaces the match with the format string <i>fmt</i>. Uses <i>flags</i>
               to determine what gets matched, and how the format string should be treated. If <i>
                  copy</i> is true then all unmatched sections of input are copied unchanged 
               to output, if the flag <em>format_first_only</em> is set then only the first 
               occurance of the pattern found is replaced. Returns the new string. See <a href="format_syntax.html">
                  also format string syntax</a>, <a href="match_flag_type.html">match flags</a>
               and <a href="match_flag_type.html">format flags</a>.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
            <td valign="top" width="43%">std::string Merge(<b>const</b> char* in, <b>const</b> 
               char* fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type flags = 
               match_default);</td>
-<td valign="top" width="42%">Performs a search and replace
+            <td valign="top" width="42%">Performs a search and replace operation: searches 
-operation: searches through the string <i>in</i> for all
+               through the string <i>in</i> for all occurrences of the current expression, for 
-occurrences of the current expression, for each occurrence replaces
+               each occurrence replaces the match with the format string <i>fmt</i>. Uses <i>flags</i>
-the match with the format string <i>fmt</i>. Uses <i>flags</i> to
+               to determine what gets matched, and how the format string should be treated. If <i>
-determine what gets matched, and how the format string should be
+                  copy</i> is true then all unmatched sections of input are copied unchanged 
-treated. If <i>copy</i> is true then all unmatched sections of
+               to output, if the flag <em>format_first_only</em> is set then only the first 
-input are copied unchanged to output, if the flag <em>
+               occurance of the pattern found is replaced. Returns the new string. See <a href="format_syntax.html">
-format_first_only</em> is set then only the first occurance of the
+                  also format string syntax</a>, <a href="match_flag_type.html">match flags</a>
-pattern found is replaced. Returns the new string. See <a href="format_syntax.html">also format string syntax</a>, <a href="match_flag_type.html">match flags</a> and <a href="match_flag_type.html">format flags</a>.</td>
+               and <a href="match_flag_type.html">format flags</a>.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
 <tr>
 <td valign="top" width="7%">&nbsp;</td>
 <td valign="top" width="43%">std::string Merge(<b>const</b> char*
 in, <b>const</b> char* fmt, <b>bool</b> copy = <b>true</b>, <b>
 unsigned int</b> flags = match_default);</td>
 <td valign="top" width="42%">Performs a search and replace
 operation: searches through the string <i>in</i> for all
 occurrences of the current expression, for each occurrence replaces
 the match with the format string <i>fmt</i>. Uses <i>flags</i> to
 determine what gets matched, and how the format string should be
 treated. If <i>copy</i> is true then all unmatched sections of
 input are copied unchanged to output, if the flag <em>
 format_first_only</em> is set then only the first occurance of the
 pattern found is replaced. Returns the new string. See <a href="format_syntax.html">also format string syntax</a>, <a href="match_flag_type.html">match flags</a> and <a href="match_flag_type.html">format flags</a>.</td>
 <td valign="top" width="7%">&nbsp;</td>
 </tr>
         <tr>
            <td>&nbsp;</td>
-<td valign="top"><b>unsigned</b>
+            <td valign="top"><b>unsigned</b> Split(std::vector&lt;std::string&gt;&amp; v, 
-Split(std::vector&lt;std::string&gt;&amp; v, std::string&amp; s,
+               std::string&amp; s, boost::match_flag_type flags = match_default, <b>unsigned</b>
-<b>unsigned</b> flags = match_default, <b>unsigned</b> max_count =
+               max_count = ~0);</td>
-~0);</td>
+            <td valign="top">Splits the input string and pushes each one onto the vector. If 
-<td valign="top">Splits the input string and pushes each one onto
+               the expression contains no marked sub-expressions, then one string is outputted 
-the vector. If the expression contains no marked sub-expressions,
+               for each section of the input that does not match the expression. If the 
-then one string is outputted for each section of the input that
+               expression does contain marked sub-expressions, then outputs one string for 
-does not match the expression. If the expression does contain
+               each marked sub-expression each time a match occurs. Outputs no more than <i>max_count</i>
-marked sub-expressions, then outputs one string for each marked
+               strings. Before returning, deletes from the input string <i>s</i> all of the 
-sub-expression each time a match occurs. Outputs no more than <i>
+               input that has been processed (all of the string if <i>max_count</i> was not 
-max_count</i> strings. Before returning, deletes from the input
+               reached). Returns the number of strings pushed onto the vector.</td>
 string <i>s</i> all of the input that has been processed (all of
 the string if <i>max_count</i> was not reached). Returns the number
 of strings pushed onto the vector.</td>
            <td>&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Position(<b>int</b> i = 0)<b>const</b>;</td>
-Position(<b>int</b> i = 0)<b>const</b>;</td>
+            <td valign="top" width="42%">Returns the position of what matched sub-expression <i>i</i>. 
-<td valign="top" width="42%">Returns the position of what matched
+               If <i>i = 0</i> then returns the position of the whole match. Returns 
-sub-expression <i>i</i>. If <i>i = 0</i> then returns the position
+               RegEx::npos if the supplied index is invalid, or if the specified 
-of the whole match. Returns RegEx::npos if the supplied index is
+               sub-expression did not participate in the match.</td>
 invalid, or if the specified sub-expression did not participate in
 the match.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Length(<b>int</b> i = 0)<b>const</b>;</td>
-Length(<b>int</b> i = 0)<b>const</b>;</td>
+            <td valign="top" width="42%">Returns the length of what matched sub-expression <i>i</i>. 
-<td valign="top" width="42%">Returns the length of what matched
+               If <i>i = 0</i> then returns the length of the whole match. Returns RegEx::npos 
-sub-expression <i>i</i>. If <i>i = 0</i> then returns the length of
+               if the supplied index is invalid, or if the specified sub-expression did not 
-the whole match. Returns RegEx::npos if the supplied index is
+               participate in the match.</td>
 invalid, or if the specified sub-expression did not participate in
 the match.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td>&nbsp;</td>
-<td><strong>bool</strong> Matched(<strong>int</strong> i =
+            <td><strong>bool</strong> Matched(<strong>int</strong> i = 0)<strong>const</strong>;</td>
-0)<strong>const</strong>;</td>
+            <td>Returns true if sub-expression <em>i</em> was matched, false otherwise.</td>
 <td>Returns true if sub-expression <em>i</em> was matched, false
 otherwise.</td>
            <td>&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Line()<b>const</b>;</td>
-Line()<b>const</b>;</td>
+            <td valign="top" width="42%">Returns the line on which the match occurred, indexes 
-<td valign="top" width="42%">Returns the line on which the match
+               start from 1 not zero, if no match occurred then returns RegEx::npos.</td>
 occurred, indexes start from 1 not zero, if no match occurred then
 returns RegEx::npos.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned int</b> Marks()
+            <td valign="top" width="43%"><b>unsigned int</b> Marks() const;</td>
-const;</td>
+            <td valign="top" width="42%">Returns the number of marked sub-expressions 
-<td valign="top" width="42%">Returns the number of marked
+               contained in the expression. Note that this includes the whole match 
-sub-expressions contained in the expression. Note that this
+               (sub-expression zero), so the value returned is always &gt;= 1.</td>
 includes the whole match (sub-expression zero), so the value
 returned is always &gt;= 1.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">std::string What(<b>int</b>
+            <td valign="top" width="43%">std::string What(<b>int</b> i)<b>const</b>;</td>
-i)<b>const</b>;</td>
+            <td valign="top" width="42%">Returns a copy of what matched sub-expression <i>i</i>. 
-<td valign="top" width="42%">Returns a copy of what matched
+               If <i>i = 0</i> then returns a copy of the whole match. Returns a null string 
-sub-expression <i>i</i>. If <i>i = 0</i> then returns a copy of the
+               if the index is invalid or if the specified sub-expression did not participate 
-whole match. Returns a null string if the index is invalid or if
+               in a match.</td>
 the specified sub-expression did not participate in a match.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">std::string <b>
+            <td valign="top" width="43%">std::string <b>operator</b>[](<b>int</b> i)<b>const</b>
-operator</b>[](<b>int</b> i)<b>const</b> ;</td>
+               ;</td>
            <td valign="top" width="42%">Returns <i>what(i);</i>
-
+               <p>Can be used to simplify access to sub-expression matches, and make usage more 
-<p>Can be used to simplify access to sub-expression matches, and
+                  perl-like.</p>
 make usage more perl-like.</p>
            </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
      </table>
      <br>
      <br>
      <p></p>
      <hr>
      <p>Revised 
         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         04 Feb 2004 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
   </body>
 </html>
--- a/doc/Attic/regex_grep.html
+++ b/doc/Attic/regex_grep.html
@@ -42,7 +42,7 @@
                         iterator first,
                         iterator last,
                         <b>const</b> basic_regex&lt;charT, traits, Allocator&gt;&amp; e,
-                         <b>unsigned</b> flags = match_default)
+                         boost::match_flag_type flags = match_default)
 </pre>
      <p>The library also defines the following convenience versions, which take either 
         a const charT*, or a const std::basic_string&lt;&gt;&amp; in place of a pair of 
@@ -53,13 +53,13 @@
 <b>unsigned</b> <b>int</b> regex_grep(Predicate foo, 
              <b>const</b> charT* str, 
              <b>const</b> basic_regex&lt;charT, traits, Allocator&gt;&amp; e, 
-              <b>unsigned</b> flags = match_default);
+              boost::match_flag_type flags = match_default);
 <b>template</b> &lt;<b>class</b> Predicate, <b>class</b> ST, <b>class</b> SA, <b>class</b> Allocator, <b>class</b> charT, <b>class</b> traits&gt;
 <b>unsigned</b> <b>int</b> regex_grep(Predicate foo, 
              <b>const</b> std::basic_string&lt;charT, ST, SA&gt;&amp; s, 
              <b>const</b> basic_regex&lt;charT, traits, Allocator&gt;&amp; e, 
-              <b>unsigned</b> flags = match_default);
+              boost::match_flag_type flags = match_default);
 </pre>
      <p>The parameters for the primary version of regex_grep have the following 
         meanings:&nbsp;</p>
@@ -370,11 +370,10 @@ index[std::string(what[5].first, what[5].second) + std::string(what[6].first, wh
      <hr>
      <p>Revised 
         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         04 Feb 2004 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
--- a/doc/Attic/regex_search.html
+++ b/doc/Attic/regex_search.html
@@ -294,7 +294,7 @@ void</B> IndexClasses(map_type&amp; m, <B>const</B> std::string&amp; file)
 &nbsp;&nbsp; start = file.begin(); 
 &nbsp;&nbsp; end = file.end();&nbsp;
 &nbsp;&nbsp; &nbsp;&nbsp; boost::<a href="match_results.html">match_results</a>&lt;std::string::const_iterator&gt; what; 
-&nbsp;&nbsp; <B>unsigned</B> <B>int</B> flags = boost::match_default; 
+&nbsp;&nbsp; boost::match_flag_type flags = boost::match_default; 
 &nbsp;&nbsp; <B>while</B>(regex_search(start, end, what, expression, flags))&nbsp;
 &nbsp;&nbsp; { 
 <FONT color=#000080>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[0] contains the whole string 
@@ -314,11 +314,10 @@ void</B> IndexClasses(map_type&amp; m, <B>const</B> std::string&amp; file)
      <HR>
      <p>Revised 
         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         04 Feb 2004 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
--- a/doc/Attic/regex_split.html
+++ b/doc/Attic/regex_split.html
@@ -38,15 +38,15 @@
      <PRE><B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2, <B>class</B> Alloc2&gt;
 std::size_t regex_split(OutputIterator out,&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::basic_string&lt;charT, Traits1, Alloc1&gt;&amp; s,&nbsp;
-&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; const</B> basic_regex&lt;charT, Traits2, Alloc2&gt;&amp; e,
+&nbsp;<B> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2, Alloc2&gt;&amp; e,
-&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; unsigned</B> flags,
+&nbsp;<STRONG>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</STRONG>boost::match_flag_type flags,
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::size_t max_split);
 <B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2, <B>class</B> Alloc2&gt;
 std::size_t regex_split(OutputIterator out,&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::basic_string&lt;charT, Traits1, Alloc1&gt;&amp; s,&nbsp;
-&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; const</B> basic_regex&lt;charT, Traits2, Alloc2&gt;&amp; e,
+&nbsp;<B> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2, Alloc2&gt;&amp; e,
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <B>unsigned</B> flags = match_default);
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; boost::match_flag_type flags = match_default);
 <B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1&gt;
 std::size_t regex_split(OutputIterator out, 
@@ -134,11 +134,10 @@ boost::regex e(<FONT color=#000080>"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)
      <HR>
      <p>Revised 
         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         04 Feb 2004 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
--- a/doc/Attic/regex_token_iterator.html
+++ b/doc/Attic/regex_token_iterator.html
@@ -76,7 +76,7 @@ typedef regex_token_iterator&lt;const char*&gt;                   cregex_token_i
 typedef regex_token_iterator&lt;std::string::const_iterator&gt;   sregex_token_iterator;
 #ifndef BOOST_NO_WREGEX
 typedef regex_token_iterator&lt;const wchar_t*&gt;                wcregex_token_iterator;
-typedef regex_token_iterator<&lt;std::wstring::const_iterator&gt; wsregex_token_iterator;
+typedef regex_token_iterator&lt;&lt;std::wstring::const_iterator&gt; wsregex_token_iterator;
 #endif
 </PRE>
      <H3><A name="description"></A>Description</H3>
@@ -84,7 +84,8 @@ typedef regex_token_iterator<&lt;std::wstring::const_iterator&gt; wsregex_token_
      <P><B> Effects:</B> constructs an end of sequence iterator.</P>
      <PRE><A name=c2></A>regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
                     int submatch = 0, match_flag_type m = match_default);</PRE>
-      <P><B> Preconditions: </B><CODE>!re.empty()</CODE>.</P>
+      <P><B> Preconditions: </B><CODE>!re.empty()</CODE>.&nbsp; Object re shall exist 
         for the lifetime of the iterator constructed from it.</P>
      <P><B> Effects:</B> constructs a regex_token_iterator that will enumerate one 
         string for each regular expression match of the expression <EM>re</EM> found 
         within the sequence <EM>[a,b)</EM>, using match flags <EM>m</EM>.&nbsp; The 
@@ -99,7 +100,8 @@ typedef regex_token_iterator<&lt;std::wstring::const_iterator&gt; wsregex_token_
            configured</A> in non-recursive mode).</P>
      <PRE><A name=c3></A>regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
                     const std::vector&lt;int&gt;&amp; submatches, match_flag_type m = match_default);</PRE>
-      <P><B> Preconditions:</B> <CODE>submatches.size() &amp;&amp; !re.empty()</CODE>.</P>
+      <P><B> Preconditions:</B> <CODE>submatches.size() &amp;&amp; !re.empty()</CODE>.&nbsp; 
         Object re shall exist for the lifetime of the iterator constructed from it.</P>
      <P><B> Effects:</B> constructs a regex_token_iterator that will enumerate <EM>submatches.size()</EM>
         strings for each regular expression match of the expression <EM>re</EM> found 
         within the sequence <EM>[a,b)</EM>, using match flags <EM>m</EM>.&nbsp; For 
@@ -118,7 +120,8 @@ typedef regex_token_iterator<&lt;std::wstring::const_iterator&gt; wsregex_token_
      <PRE><A name=c4></A>template &lt;std::size_t N&gt;
 regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
                     const int (&amp;submatches)[R], match_flag_type m = match_default);</PRE>
-      <P><B> Preconditions: </B><CODE>!re.empty()</CODE>.</P>
+      <P><B> Preconditions: </B><CODE>!re.empty()</CODE>.&nbsp; Object re shall exist 
         for the lifetime of the iterator constructed from it.</P>
      <P><STRONG>Effects:</STRONG></B> constructs a regex_token_iterator that will 
         enumerate&nbsp;<EM>R</EM> strings for each regular expression match of the 
         expression <EM>re</EM> found within the sequence <EM>[a,b)</EM>, using match 
--- a/doc/Attic/regex_traits.html
+++ b/doc/Attic/regex_traits.html
@@ -24,10 +24,12 @@
      </P>
      <HR>
      <p></p>
-      <P>Under construction.</P>
+      <P>
-      <P>The current boost.regex traits class design will be migrated to that specified 
+         Under construction: the current design will be replaced by that specified in 
-         in the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">regular 
+         the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">regular 
-            expression standardization proposal</A>.&nbsp;</P>
+            expression standardization proposal</A>, the current (obsolete) design has 
         it's <A href="http://cvs.sourceforge.net/viewcvs.py/*checkout*/boost/boost/libs/regex/Attic/traits_class_ref.htm?rev=1.11">
            documentation archived online</A>.</P>
      <P>
         <HR>
      <P></P>
@@ -36,11 +38,9 @@
         24 Oct 2003 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
   </body>
 </html>
--- a/doc/Attic/syntax.html
+++ b/doc/Attic/syntax.html
@@ -91,18 +91,18 @@
      <P>Parentheses serve two purposes, to group items together into a sub-expression, 
         and to mark what generated the match. For example the expression "(ab)*" would 
         match all of the string "ababab". The matching algorithms <A href="regex_match.html">
-            regex_match</A> and <A href="regex_search.html">regex_search</A>
+            regex_match</A> and <A href="regex_search.html">regex_search</A> each take 
-         each take an instance of <A href="match_results.html">match_results</A>
+         an instance of <A href="match_results.html">match_results</A> that reports what 
-         that reports what caused the match, on exit from these functions the <A href="match_results.html">
+         caused the match, on exit from these functions the <A href="match_results.html">match_results</A>
-            match_results</A> contains information both on what the whole expression 
+         contains information both on what the whole expression matched and on what each 
-         matched and on what each sub-expression matched. In the example above 
+         sub-expression matched. In the example above match_results[1] would contain a 
-         match_results[1] would contain a pair of iterators denoting the final "ab" of 
+         pair of iterators denoting the final "ab" of the matching string. It is 
-         the matching string. It is permissible for sub-expressions to match null 
+         permissible for sub-expressions to match null strings. If a sub-expression 
-         strings. If a sub-expression takes no part in a match - for example if it is 
+         takes no part in a match - for example if it is part of an alternative that is 
-         part of an alternative that is not taken - then both of the iterators that are 
+         not taken - then both of the iterators that are returned for that 
-         returned for that sub-expression point to the end of the input string, and the <I>matched</I>
+         sub-expression point to the end of the input string, and the <I>matched</I> parameter 
-         parameter for that sub-expression is <I>false</I>. Sub-expressions are indexed 
+         for that sub-expression is <I>false</I>. Sub-expressions are indexed from left 
-         from left to right starting from 1, sub-expression 0 is the whole expression.
+         to right starting from 1, sub-expression 0 is the whole expression.
      </P>
      <H3>Non-Marking Parenthesis
      </H3>
@@ -143,7 +143,7 @@
      <P>A set is a set of characters that can match any single character that is a 
         member of the set. Sets are delimited by "[" and "]" and can contain literals, 
         character ranges, character classes, collating elements and equivalence 
-         classes. Set declarations that start with "^" contain the compliment of the 
+         classes. Set declarations that start with "^" contain the complement of the 
         elements that follow.
      </P>
      <P>Examples:
@@ -682,7 +682,8 @@
         chosen is the one with the longest first sub-expression, if that is the same 
         for two or more matches, then the second sub-expression will be examined and so 
         on.
-      </P><P>
+      </P>
      <P>
         The following table examples illustrate the main differences between Perl and 
         POSIX regular expression matching rules:
      </P>
@@ -708,24 +709,23 @@
                     <P><CODE>a|ab</CODE></P>
                  </TD>
                  <TD vAlign="top" width="25%">
-                  <P><CODE>
+                     <P><CODE> xaby</CODE>
                  xaby</CODE>
                     </P>
                  </TD>
                  <TD vAlign="top" width="25%">
-            <P><CODE>
+                     <P><CODE> "ab"</CODE></P>
-            "ab"</CODE></P></TD>
+                  </TD>
                  <TD vAlign="top" width="25%">
-            <P><CODE>
+                     <P><CODE> "a"</CODE></P>
-            "a"</CODE></P></TD>
+                  </TD>
               </TR>
               <TR>
                  <TD vAlign="top" width="25%">
-               <P><CODE>
+                     <P><CODE> .*([[:alnum:]]+).*</CODE></P>
-               .*([[:alnum:]]+).*</CODE></P></TD>
+                  </TD>
                  <TD vAlign="top" width="25%">
-               <P><CODE>
+                     <P><CODE> " abc def xyz "</CODE></P>
-               " abc def xyz "</CODE></P></TD>
+                  </TD>
                  <TD vAlign="top" width="25%">
                     <P>$0 = " abc def xyz "<BR>
                        $1 = "abc"</P>
@@ -737,14 +737,14 @@
               </TR>
               <TR>
                  <TD vAlign="top" width="25%">
-               <P><CODE>
+                     <P><CODE> .*(a|xayy)</CODE></P>
-               .*(a|xayy)</CODE></P></TD>
+                  </TD>
                  <TD vAlign="top" width="25%">
-               <P><CODE>
+                     <P><CODE> zzxayyzz</CODE></P>
-               zzxayyzz</CODE></P></TD>
+                  </TD>
                  <TD vAlign="top" width="25%">
-               <P><CODE>
+                     <P><CODE> "zzxayy"</CODE></P>
-               "zzxayy"</CODE></P></TD>
+                  </TD>
                  <TD vAlign="top" width="25%">
                     <P><CODE>"zzxa"</CODE></P>
                  </TD>
@@ -753,19 +753,16 @@
      <P>These differences between Perl matching rules, and POSIX matching rules, mean 
         that these two regular expression syntaxes differ not only in the features 
         offered, but also in the form that the state machine takes and/or the 
-         algorithms used to traverse the state machine.</p>
+         algorithms used to traverse the state machine.</P>
      <HR>
      <p>Revised 
         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
         24 Oct 2003 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
   </body>
 </html>
--- a/doc/captures.html
+++ b/doc/captures.html
@@ -24,6 +24,11 @@
      </P>
      <HR>
      <p></p>
      <P>Captures are the iterator ranges that are "captured" by marked sub-expressions 
         as a regular expression gets matched.&nbsp; Each marked sub-expression can 
         result in more than one capture, if it is matched more than once.&nbsp; This 
         document explains how captures and marked sub-expressions in Boost.Regex are 
         represented and accessed.</P>
      <H2>Marked sub-expressions</H2>
      <P>Every time a Perl regular expression contains a parenthesis group (), it spits 
         out an extra field, known as a marked sub-expression, for example the 
@@ -247,4 +252,3 @@ Text:        "now is the time for all good men to come to the aid of the party"
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
   </body>
 </html>
--- a/doc/contacts.html
+++ b/doc/contacts.html
@@ -25,25 +25,32 @@
      <BR>
      <BR>
      <HR>
-      <P>The author can be contacted at john@johnmaddock.co.uk;&nbsp;the 
+      <P>The author can be contacted at john@johnmaddock.co.uk;&nbsp;the home page for 
-         home page for this library is at <A href="http://www.boost.org">www.boost.org</A>.</P>
+         this library is at <A href="http://www.boost.org">www.boost.org</A>.</P>
-      <P>I am indebted to Robert Sedgewick's "Algorithms in C++" for forcing me to think 
+      <P>I am indebted to <A href="http://www.cs.princeton.edu/~rs/">Robert Sedgewick's 
-         about algorithms and their performance, and to the folks at boost for forcing 
+            "Algorithms in C++" </A>for forcing me to think about algorithms and their 
-         me to <I>think</I>, period. The following people have all contributed useful 
+         performance, and to the folks at <A href="http://www.boost.org">boost</A> for 
-         comments or fixes: Dave Abrahams, Mike Allison, Edan Ayal, Jayashree 
+         forcing me to <I>think</I>, period.</P>
-         Balasubramanian, Jan B<>lsche, Beman Dawes, Paul Baxter, David Bergman, David 
+      <P><A href="http://www.boost-consulting.com">Eric Niebler</A>, author of the <A href="http://research.microsoft.com/projects/greta">
-         Dennerline, Edward Diener, Peter Dimov, Robert Dunn, Fabio Forno, Tobias 
+            GRETA regular expression component</A>, has shared several important ideas, 
-         Gabrielsson, Rob Gillen, Marc Gregoire, Chris Hecker, Nick Hodapp, Jesse Jones, 
+         in a series of long discussions.</P>
-         Martin Jost, Boris Krasnovskiy, Jan Hermelink, Max Leung, Wei-hao Lin, Jens 
+      <P>Pete Becker, of <A href="http://www.dinkumware.com/">Dinkumware Ltd</A>, has 
-         Maurer, Richard Peters, Heiko Schmidt, Jason Shirk, Gerald Slacik, Scobie 
+         helped enormously with the standardisation proposal language.</P>
-         Smith, Mike Smyth, Alexander Sokolovsky, Herv<72> Poirier, Michael Raykh, Marc 
+      <P>The following people have all contributed useful comments or fixes: Dave 
-         Recht, Scott VanCamp, Bruno Voigt, Alexey Voinov, Jerry Waldorf, Rob Ward, 
+         Abrahams, Mike Allison, Edan Ayal, Jayashree Balasubramanian, Jan B<>lsche, 
-         Lealon Watts, Thomas Witt and Yuval Yosef. I am also grateful to the manuals 
+         Beman Dawes, Paul Baxter, David Bergman, David Dennerline, Edward Diener, Peter 
-         supplied with the Henry Spencer, Perl and GNU regular expression libraries - 
+         Dimov, Robert Dunn, Fabio Forno, Tobias Gabrielsson, Rob Gillen, Marc Gregoire, 
-         wherever possible I have tried to maintain compatibility with these libraries 
+         Chris Hecker, Nick Hodapp, Jesse Jones, Martin Jost, Boris Krasnovskiy, Jan 
-         and with the POSIX standard - the code however is entirely my own, including 
+         Hermelink, Max Leung, Wei-hao Lin, Jens Maurer, Richard Peters, Heiko Schmidt, 
-         any bugs! I can absolutely guarantee that I will not fix any bugs I don't know 
+         Jason Shirk, Gerald Slacik, Scobie Smith, Mike Smyth, Alexander Sokolovsky, 
-         about, so if you have any comments or spot any bugs, please get in touch.</P>
+         Herv<EFBFBD> Poirier, Michael Raykh, Marc Recht, Scott VanCamp, Bruno Voigt, Alexey 
         Voinov, Jerry Waldorf, Rob Ward, Lealon Watts, John Wismar, Thomas Witt and 
         Yuval Yosef. I am also grateful to the manuals supplied with the Henry Spencer, 
         Perl and GNU regular expression libraries - wherever possible I have tried to 
         maintain compatibility with these libraries and with the POSIX standard - the 
         code however is entirely my own, including any bugs! I can absolutely guarantee 
         that I will not fix any bugs I don't know about, so if you have any comments or 
         spot any bugs, please get in touch.</P>
      <P>Useful further information can be found at:</P>
      <P>Short&nbsp;tutorials on regular expressions can be <A href="http://etext.lib.virginia.edu/helpsheets/regex.html">
            found here</A> and&nbsp;<A href="http://www.devshed.com/Server_Side/Administration/RegExp/page1.html">here</A>.</P>
@@ -72,8 +79,7 @@
         24 Oct 2003 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -1,153 +1,114 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
   <head>
 <meta name="generator" content="HTML Tidy, see www.w3.org">
      <title>Boost.Regex: FAQ</title>
-<meta http-equiv="Content-Type" content=
+      <meta name="generator" content="HTML Tidy, see www.w3.org">
-"text/html; charset=iso-8859-1">
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
      <link rel="stylesheet" type="text/css" href="../../../boost.css">
   </head>
   <body>
      <p></p>
-
+      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
 <table id="Table1" cellspacing="1" cellpadding="1" width="100%"
 border="0">
         <tr>
            <td valign="top" width="300">
-<h3><a href="../../../index.htm"><img height="86" width="277" alt=
+               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
 "C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
            </td>
            <td width="353">
               <h1 align="center">Boost.Regex</h1>
               <h2 align="center">FAQ</h2>
            </td>
            <td width="50">
-<h3><a href="index.html"><img height="45" width="43" alt=
+               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
 "Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
            </td>
         </tr>
      </table>
      <br>
      <br>
      <hr>
      <font color="#ff0000"><font color="#ff0000"></font></font>
-<p><font color="#ff0000"><font color="#ff0000"><font color=
+      <p><font color="#ff0000"><font color="#ff0000"><font color="#ff0000">&nbsp;Q. Why can't I 
-"#ff0000">&nbsp;Q. Why can't I use the "convenience" versions of
+                  use the "convenience" versions of regex_match / regex_search / regex_grep / 
-regex_match / regex_search / regex_grep / regex_format /
+                  regex_format / regex_merge?</font></font></font></p>
-regex_merge?</font></font></font></p>
+      <p>A. These versions may or may not be available depending upon the capabilities 
-
+         of your compiler, the rules determining the format of these functions are quite 
-<p>A. These versions may or may not be available depending upon the
+         complex - and only the versions visible to a standard compliant compiler are 
-capabilities of your compiler, the rules determining the format of
+         given in the help. To find out what your compiler supports, run 
-these functions are quite complex - and only the versions visible
+         &lt;boost/regex.hpp&gt; through your C++ pre-processor, and search the output 
-to a standard compliant compiler are given in the help. To find out
+         file for the function that you are interested in.<font color="#ff0000"><font color="#ff0000"></font></font></p>
-what your compiler supports, run &lt;boost/regex.hpp&gt; through
+      <p><font color="#ff0000"><font color="#ff0000">Q. I can't get regex++ to work with 
-your C++ pre-processor, and search the output file for the function
+               escape characters, what's going on?</font></font></p>
-that you are interested in.<font color="#ff0000"><font color=
+      <p>A. If you embed regular expressions in C++ code, then remember that escape 
-"#ff0000"></font></font></p>
+         characters are processed twice: once by the C++ compiler, and once by the 
-
+         regex++ expression compiler, so to pass the regular expression \d+ to regex++, 
-<p><font color="#ff0000"><font color="#ff0000">Q. I can't get
+         you need to embed "\\d+" in your code. Likewise to match a literal backslash 
-regex++ to work with escape characters, what's going
+         you will need to embed "\\\\" in your code. <font color="#ff0000"></font>
-on?</font></font></p>
+      </p>
-
+      <p><font color="#ff0000">Q. Why does using parenthesis in a POSIX regular expression 
-<p>A. If you embed regular expressions in C++ code, then remember
+            change the result of a match?</font></p>
-that escape characters are processed twice: once by the C++
+      <p>For POSIX (extended and basic) regular expressions, but not for perl regexes, 
-compiler, and once by the regex++ expression compiler, so to pass
+         parentheses don't only mark; they determine what the best match is as well. 
-the regular expression \d+ to regex++, you need to embed "\\d+" in
+         When the expression is compiled as a POSIX basic or extended regex then 
-your code. Likewise to match a literal backslash you will need to
+         Boost.regex follows the POSIX standard leftmost longest rule for determining 
-embed "\\\\" in your code. <font color="#ff0000"></font></p>
+         what matched. So if there is more than one possible match after considering the 
-
+         whole expression, it looks next at the first sub-expression and then the second 
-<p><font color="#ff0000">Q. Why does using parenthesis in a POSIX
+         sub-expression and so on. So...</p>
 regular expression change the result of a match?</font></p>
 <p>For POSIX (extended and basic) regular expressions, but not for
 perl regexes, parentheses don't only mark; they determine what the
 best match is as well. When the expression is compiled as a POSIX
 basic or extended regex then Boost.regex follows the POSIX standard
 leftmost longest rule for determining what matched. So if there is
 more than one possible match after considering the whole
 expression, it looks next at the first sub-expression and then the
 second sub-expression and so on. So...</p>
      <pre>
 "(0*)([0-9]*)" against "00123" would produce
 $1 = "00"
 $2 = "123"
 </pre>
      <p>where as</p>
      <pre>
-"0*([0-9)*" against "00123" would produce
+"0*([0-9])*" against "00123" would produce
 $1 = "00123"
 </pre>
-
+      <p>If you think about it, had $1 only matched the "123", this would be "less good" 
-<p>If you think about it, had $1 only matched the "123", this would
+         than the match "00123" which is both further to the left and longer. If you 
-be "less good" than the match "00123" which is both further to the
+         want $1 to match only the "123" part, then you need to use something like:</p>
 left and longer. If you want $1 to match only the "123" part, then
 you need to use something like:</p>
      <pre>
 "0*([1-9][0-9]*)"
 </pre>
      <p>as the expression.</p>
-
+      <p><font color="#ff0000">Q. Why don't character ranges work properly (POSIX mode 
-<p><font color="#ff0000">Q. Why don't character ranges work
+            only)?</font><br>
-properly (POSIX mode only)?</font><br>
+         A. The POSIX standard specifies that character range expressions are locale 
- A. The POSIX standard specifies that character range expressions
+         sensitive - so for example the expression [A-Z] will match any collating 
-are locale sensitive - so for example the expression [A-Z] will
+         element that collates between 'A' and 'Z'. That means that for most locales 
-match any collating element that collates between 'A' and 'Z'. That
+         other than "C" or "POSIX", [A-Z] would match the single character 't' for 
-means that for most locales other than "C" or "POSIX", [A-Z] would
+         example, which is not what most people expect - or at least not what most 
-match the single character 't' for example, which is not what most
+         people have come to expect from regular expression engines. For this reason, 
-people expect - or at least not what most people have come to
+         the default behaviour of boost.regex (perl mode) is to turn locale sensitive 
-expect from regular expression engines. For this reason, the
+         collation off by not setting the regex_constants::collate compile time flag. 
-default behaviour of boost.regex (perl mode) is to turn locale
+         However if you set a non-default compile time flag - for example 
-sensitive collation off by not setting the regex_constants::collate
+         regex_constants::extended or regex_constants::basic, then locale dependent 
-compile time flag. However if you set a non-default compile time
+         collation will be enabled, this also applies to the POSIX API functions which 
-flag - for example regex_constants::extended or
+         use either regex_constants::extended or regex_constants::basic internally. <i>[Note 
-regex_constants::basic, then locale dependent collation will be
+            - when regex_constants::nocollate in effect, the library behaves "as if" the 
-enabled, this also applies to the POSIX API functions which use
+            LC_COLLATE locale category were always "C", regardless of what its actually set 
-either regex_constants::extended or regex_constants::basic
+            to - end note</i>].</p>
-internally. <i>[Note - when regex_constants::nocollate in effect,
+      <p><font color="#ff0000">Q. Why are there no throw specifications on any of the 
-the library behaves "as if" the LC_COLLATE locale category were
+            functions? What exceptions can the library throw?</font></p>
-always "C", regardless of what its actually set to - end
+      <p>A. Not all compilers support (or honor) throw specifications, others support 
-note</i>].</p>
+         them but with reduced efficiency. Throw specifications may be added at a later 
-
+         date as compilers begin to handle this better. The library should throw only 
-<p><font color="#ff0000">Q. Why are there no throw specifications
+         three types of exception: boost::bad_expression can be thrown by basic_regex 
-on any of the functions? What exceptions can the library
+         when compiling a regular expression, std::runtime_error can be thrown when a 
-throw?</font></p>
+         call to basic_regex::imbue tries to open a message catalogue that doesn't 
-
+         exist, or when a call to regex_search or regex_match results in an 
-<p>A. Not all compilers support (or honor) throw specifications,
+         "everlasting" search,&nbsp;or when a call to RegEx::GrepFiles or 
-others support them but with reduced efficiency. Throw
+         RegEx::FindFiles tries to open a file that cannot be opened, finally 
-specifications may be added at a later date as compilers begin to
+         std::bad_alloc can be thrown by just about any of the functions in this 
-handle this better. The library should throw only three types of
+         library.</p>
 exception: boost::bad_expression can be thrown by basic_regex when
 compiling a regular expression, std::runtime_error can be thrown
 when a call to basic_regex::imbue tries to open a message catalogue
 that doesn't exist, or when a call to regex_search or regex_match
 results in an "everlasting" search,&nbsp;or when a call to
 RegEx::GrepFiles or RegEx::FindFiles tries to open a file that
 cannot be opened, finally std::bad_alloc can be thrown by just
 about any of the functions in this library.</p>
      <p></p>
      <hr>
      <p>Revised 
         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
         24 Oct 2003 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
   </body>
 </html>
--- a/doc/index.html
+++ b/doc/index.html
@@ -46,10 +46,10 @@
                  <dl class="index">
                     <dt><a href="syntax_option_type.html">syntax_option_type</a></dt> <dt><a href="match_flag_type.html">
                           match_flag_type</a></dt> <dt><a href="bad_expression.html">class bad_expression</a></dt>
-                     <dt><a href="regex_traits.html">class regex_traits</a></dt> <dt><a href="basic_regex.html">
+                     <dt><a href="regex_traits.html">class regex_traits</a></dt> 
-                           class template basic_regex</a></dt> <dt><a href="sub_match.html">class template 
+                     <dt><a href="basic_regex.html">class template basic_regex</a></dt> 
-                           sub_match</a></dt> <dt><a href="match_results.html">class template 
+                     <dt><a href="sub_match.html">class template sub_match</a></dt> 
-                           match_results</a></dt>
+                     <dt><a href="match_results.html">class template match_results</a></dt>
                  </dl>
               </dd>
               <dt>Algorithms</dt>
@@ -66,6 +66,25 @@
                     <dt><a href="regex_token_iterator.html">regex_token_iterator</a></dt>
                  </dl>
               </dd>
               <dt>Typedefs</dt>
               <dd>
                  <dl class="index">
                     <dt><a href="basic_regex.html">regex</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = basic_regex&lt;char&gt; ]</dt> 
                     <dt><a href="basic_regex.html">wregex</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = basic_regex&lt;wchar_t&gt; ]</dt> 
                     <dt><a href="match_results.html">cmatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = match_results&lt;const char*&gt; ]</dt>
                     <dt><a href="match_results.html">wcmatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = match_results&lt;const wchar_t*&gt; ]</dt>
                     <dt><a href="match_results.html">smatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = match_results&lt;std::string::const_iterator&gt; ]</dt>
                     <dt><a href="match_results.html">wsmatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = match_results&lt;std::wstring::const_iterator&gt; ]</dt>
                     <dt><a href="regex_iterator.html">cregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_iterator&lt;const char*&gt;]</dt>
                     <dt><a href="regex_iterator.html">wcregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_iterator&lt;const wchar_t*&gt;]</dt>
                     <dt><a href="regex_iterator.html">sregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_iterator&lt;std::string::const_iterator&gt;]</dt>
                     <dt><a href="regex_iterator.html">wsregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_iterator&lt;std::wstring::const_iterator&gt;]</dt>
                     <dt><a href="regex_token_iterator.html">cregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_token_iterator&lt;const char*&gt;]</dt>
                     <dt><a href="regex_token_iterator.html">wcregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_token_iterator&lt;const wchar_t*&gt;]</dt>
                     <dt><a href="regex_token_iterator.html">sregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_token_iterator&lt;std::string::const_iterator&gt;]</dt>
                     <dt><a href="regex_token_iterator.html">wsregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_token_iterator&lt;std::wstring::const_iterator&gt;]</dt>
                  </dl>
               </dd>
               <dt>Misc.</dt>
               <dd>
                  <dl class="index">
--- a/doc/match_flag_type.html
+++ b/doc/match_flag_type.html
@@ -31,7 +31,7 @@
         character sequence.&nbsp; The behavior of the format flags is descibed in more 
         detail in the <A href="format_syntax.html">format syntax guide</A>.</p>
      <pre>
-namespace std{ namespace regex_constants{
+namespace boost{ namespace regex_constants{
 typedef bitmask_type match_flag_type;
@@ -59,7 +59,7 @@ static const match_flag_type format_first_only;
 static const match_flag_type format_all;
 } // namespace regex_constants
-} // namespace std
+} // namespace boost
 </pre>
      <h3>Description</h3>
      <p>The type <code>match_flag_type</code> is an implementation defined bitmask type 
@@ -271,10 +271,10 @@ static const match_flag_type format_all;
      <br>
      <p>Revised 
         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         04 Feb 2004 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
--- a/doc/match_results.html
+++ b/doc/match_results.html
@@ -344,7 +344,7 @@ const_iterator end()const;
      <p><b>Effects:</b> Returns a terminating iterator that enumerates over all the 
         marked sub-expression matches stored in *this.</p>
      <h4><A name="format"></A>match_results reformatting</h4>
-      <pre>template &lt;class OutputIterator&gt;
+      <pre><A name=m12></A>template &lt;class OutputIterator&gt;
 OutputIterator format(OutputIterator out,
                      const string_type&amp; fmt,
                      <A href="match_flag_type.html" >match_flag_type</A> flags = format_default);
--- a/doc/regex.html
+++ b/doc/regex.html
@@ -1,55 +1,42 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
   <head>
 <meta name="generator" content="HTML Tidy, see www.w3.org">
      <title>Boost.Regex: class RegEx (deprecated)</title>
-<meta http-equiv="Content-Type" content=
+      <meta name="generator" content="HTML Tidy, see www.w3.org">
-"text/html; charset=iso-8859-1">
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
      <link rel="stylesheet" type="text/css" href="../../../boost.css">
   </head>
   <body>
      <p></p>
-
+      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
 <table id="Table1" cellspacing="1" cellpadding="1" width="100%"
 border="0">
         <tr>
            <td valign="top" width="300">
-<h3><a href="../../../index.htm"><img height="86" width="277" alt=
+               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
 "C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
            </td>
            <td width="353">
               <h1 align="center">Boost.Regex</h1>
               <h2 align="center">class RegEx (deprecated)</h2>
            </td>
            <td width="50">
-<h3><a href="index.html"><img height="45" width="43" alt=
+               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
 "Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
            </td>
         </tr>
      </table>
      <br>
      <br>
      <hr>
-<p>The high level wrapper class RegEx is now deprecated and does
+      <p>The high level wrapper class RegEx is now deprecated and does not form a part 
-not form a part of the <a href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
+         of the <a href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">regular 
-regular expression standardization proposal</a>.&nbsp; This type
+            expression standardization proposal</a>.&nbsp; This type still exists, and 
-still exists, and existing code will continue to compile, however
+         existing code will continue to compile, however the following documentation is 
-the following documentation is unlikely to be further updated.</p>
+         unlikely to be further updated.</p>
      <pre>
 #include &lt;boost/cregex.hpp&gt;
 </pre>
-
+      <p>The class RegEx provides a high level simplified interface to the regular 
-<p>The class RegEx provides a high level simplified interface to
+         expression library, this class only handles narrow character strings, and 
-the regular expression library, this class only handles narrow
+         regular expressions always follow the "normal" syntax - that is the same as the 
-character strings, and regular expressions always follow the
+         perl / ECMAScript synatx.</p>
 "normal" syntax - that is the same as the perl / ECMAScript
 synatx.</p>
      <pre>
 <b>typedef</b> <b>bool</b> (*GrepCallback)(<b>const</b> RegEx&amp; expression);
 <b>typedef</b> <b>bool</b> (*GrepFileCallback)(<b>const</b> <b>char</b>* file, <b>const</b> RegEx&amp; expression);
@@ -72,23 +59,23 @@ synatx.</p>
   <font color="#000080"><i>//
 </i>   <i>// now matching operators:</i> 
   <i>//</i></font> 
-   <b>bool</b> Match(<b>const</b> <b>char</b>* p, <b>unsigned</b> <b>int</b> flags = match_default);
+   <b>bool</b> Match(<b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default);
-   <b>bool</b> Match(<b>const</b> std::string&amp; s, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>bool</b> Match(<b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>bool</b> Search(<b>const</b> <b>char</b>* p, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>bool</b> Search(<b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>bool</b> Search(<b>const</b> std::string&amp; s, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>bool</b> Search(<b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b> <b>char</b>* p, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b> std::string&amp; s, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b> <b>char</b>* p, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b> std::string&amp; s, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned</b> <b>int</b>&gt;&amp; v, <b>const</b> <b>char</b>* p, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned</b> <b>int</b>&gt;&amp; v, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned</b> <b>int</b>&gt;&amp; v, <b>const</b> std::string&amp; s, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned</b> <b>int</b>&gt;&amp; v, <b>const</b> std::string&amp; s, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>int</b> flags = match_default); 
+   <b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, boost::match_flag_type flags = match_default); 
-   std::string Merge(<b>const</b> std::string&amp; in, <b>const</b> std::string&amp; fmt, <b>bool</b> copy = <b>true</b>, <b>unsigned</b> <b>int</b> flags = match_default); 
+   std::string Merge(<b>const</b> std::string&amp; in, <b>const</b> std::string&amp; fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type flags = match_default); 
-   std::string Merge(<b>const</b> char* in, <b>const</b> char* fmt, <b>bool</b> copy = <b>true</b>, <b>unsigned int</b> flags = match_default); 
+   std::string Merge(<b>const</b> char* in, <b>const</b> char* fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type flags = match_default); 
-   <b>unsigned</b> Split(std::vector&lt;std::string&gt;&amp; v, std::string&amp; s, <b>unsigned</b> flags = match_default, <b>unsigned</b> max_count = ~0); 
+   <b>unsigned</b> Split(std::vector&lt;std::string&gt;&amp; v, std::string&amp; s, boost::match_flag_type flags = match_default, <b>unsigned</b> max_count = ~0); 
   <font color="#000080"><i>// 
 </i>   <i>// now operators for returning what matched in more detail: 
 </i>   <i>// 
@@ -103,509 +90,392 @@ synatx.</p>
   <strong>static const unsigned int</strong> npos;
 };    
 </pre>
      <p>Member functions for class RegEx are defined as follows:<br>
         &nbsp;</p>
      <p></p>
-
+      <table id="Table2" cellspacing="0" cellpadding="7" width="100%" border="0">
 <table id="Table2" cellspacing="0" cellpadding="7" width="100%"
 border="0">
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
            <td valign="top" width="43%">RegEx();</td>
-<td valign="top" width="42%">Default constructor, constructs an
+            <td valign="top" width="42%">Default constructor, constructs an instance of RegEx 
-instance of RegEx without any valid expression.</td>
+               without any valid expression.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
            <td valign="top" width="43%">RegEx(<b>const</b> RegEx&amp; o);</td>
-<td valign="top" width="42%">Copy constructor, all the properties
+            <td valign="top" width="42%">Copy constructor, all the properties of parameter <i>o</i>
-of parameter <i>o</i> are copied.</td>
+               are copied.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">RegEx(<b>const</b> <b>char</b>* c, <b>
+            <td valign="top" width="43%">RegEx(<b>const</b> <b>char</b>* c, <b>bool</b> icase 
-bool</b> icase = <b>false</b>);</td>
+               = <b>false</b>);</td>
-<td valign="top" width="42%">Constructs an instance of RegEx,
+            <td valign="top" width="42%">Constructs an instance of RegEx, setting the 
-setting the expression to <i>c</i>, if <i>icase</i> is <i>true</i>
+               expression to <i>c</i>, if <i>icase</i> is <i>true</i> then matching is 
-then matching is insensitive to case, otherwise it is sensitive to
+               insensitive to case, otherwise it is sensitive to case. Throws <i>bad_expression</i>
-case. Throws <i>bad_expression</i> on failure.</td>
+               on failure.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">RegEx(<b>const</b> std::string&amp; s,
+            <td valign="top" width="43%">RegEx(<b>const</b> std::string&amp; s, <b>bool</b> icase 
-<b>bool</b> icase = <b>false</b>);</td>
+               = <b>false</b>);</td>
-<td valign="top" width="42%">Constructs an instance of RegEx,
+            <td valign="top" width="42%">Constructs an instance of RegEx, setting the 
-setting the expression to <i>s</i>, if <i>icase</i> is <i>true</i>
+               expression to <i>s</i>, if <i>icase</i> is <i>true</i> then matching is 
-then matching is insensitive to case, otherwise it is sensitive to
+               insensitive to case, otherwise it is sensitive to case. Throws <i>bad_expression</i>
-case. Throws <i>bad_expression</i> on failure.</td>
+               on failure.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">RegEx&amp; <b>
+            <td valign="top" width="43%">RegEx&amp; <b>operator</b>=(<b>const</b> RegEx&amp; 
-operator</b>=(<b>const</b> RegEx&amp; o);</td>
+               o);</td>
            <td valign="top" width="42%">Default assignment operator.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">RegEx&amp; <b>
+            <td valign="top" width="43%">RegEx&amp; <b>operator</b>=(<b>const</b> <b>char</b>* 
-operator</b>=(<b>const</b> <b>char</b>* p);</td>
+               p);</td>
-<td valign="top" width="42%">Assignment operator, equivalent to
+            <td valign="top" width="42%">Assignment operator, equivalent to calling <i>SetExpression(p, 
-calling <i>SetExpression(p, false).</i> Throws <i>
+                  false).</i> Throws <i>bad_expression</i> on failure.</td>
 bad_expression</i> on failure.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">RegEx&amp; <b>
+            <td valign="top" width="43%">RegEx&amp; <b>operator</b>=(<b>const</b> std::string&amp; 
-operator</b>=(<b>const</b> std::string&amp; s);</td>
+               s);</td>
-<td valign="top" width="42%">Assignment operator, equivalent to
+            <td valign="top" width="42%">Assignment operator, equivalent to calling <i>SetExpression(s, 
-calling <i>SetExpression(s, false).</i> Throws <i>
+                  false).</i> Throws <i>bad_expression</i> on failure.</td>
 bad_expression</i> on failure.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> SetExpression(<b>constchar</b>* 
-SetExpression(<b>constchar</b>* p, <b>bool</b> icase = <b>
+               p, <b>bool</b> icase = <b>false</b>);</td>
-false</b>);</td>
+            <td valign="top" width="42%">Sets the current expression to <i>p</i>, if <i>icase</i>
-<td valign="top" width="42%">Sets the current expression to <i>
+               is <i>true</i> then matching is insensitive to case, otherwise it is sensitive 
-p</i>, if <i>icase</i> is <i>true</i> then matching is insensitive
+               to case. Throws <i>bad_expression</i> on failure.</td>
 to case, otherwise it is sensitive to case. Throws <i>
 bad_expression</i> on failure.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> SetExpression(<b>const</b> 
-SetExpression(<b>const</b> std::string&amp; s, <b>bool</b> icase =
+               std::string&amp; s, <b>bool</b> icase = <b>false</b>);</td>
-<b>false</b>);</td>
+            <td valign="top" width="42%">Sets the current expression to <i>s</i>, if <i>icase</i>
-<td valign="top" width="42%">Sets the current expression to <i>
+               is <i>true</i> then matching is insensitive to case, otherwise it is sensitive 
-s</i>, if <i>icase</i> is <i>true</i> then matching is insensitive
+               to case. Throws <i>bad_expression</i> on failure.</td>
 to case, otherwise it is sensitive to case. Throws <i>
 bad_expression</i> on failure.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">std::string
+            <td valign="top" width="43%">std::string Expression()<b>const</b>;</td>
-Expression()<b>const</b>;</td>
+            <td valign="top" width="42%">Returns a copy of the current regular expression.</td>
 <td valign="top" width="42%">Returns a copy of the current regular
 expression.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>bool</b> Match(<b>const</b> <b>
+            <td valign="top" width="43%"><b>bool</b> Match(<b>const</b> <b>char</b>* p, 
-char</b>* p, <b>unsigned</b> <b>int</b> flags =
+               boost::match_flag_type flags = match_default);</td>
-match_default);</td>
+            <td valign="top" width="42%">Attempts to match the current expression against the 
-<td valign="top" width="42%">Attempts to match the current
+               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-expression against the text <i>p</i> using the match flags <i>
+                  match flags</a>. Returns <i>true</i> if the expression matches the whole of 
-flags</i> - see <a href="match_flag_type.html">match flags</a>.
+               the input string.</td>
 Returns <i>true</i> if the expression matches the whole of the
 input string.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>bool</b> Match(<b>const</b>
+            <td valign="top" width="43%"><b>bool</b> Match(<b>const</b> std::string&amp; s, 
-std::string&amp; s, <b>unsigned</b> <b>int</b> flags =
+               boost::match_flag_type flags = match_default) ;</td>
-match_default) ;</td>
+            <td valign="top" width="42%">Attempts to match the current expression against the 
-<td valign="top" width="42%">Attempts to match the current
+               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-expression against the text <i>s</i> using the match flags <i>
+                  match flags</a>. Returns <i>true</i> if the expression matches the whole of 
-flags</i> - see <a href="match_flag_type.html">match flags</a>.
+               the input string.</td>
 Returns <i>true</i> if the expression matches the whole of the
 input string.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>bool</b> Search(<b>const</b> <b>
+            <td valign="top" width="43%"><b>bool</b> Search(<b>const</b> <b>char</b>* p, 
-char</b>* p, <b>unsigned</b> <b>int</b> flags =
+               boost::match_flag_type flags = match_default);</td>
-match_default);</td>
+            <td valign="top" width="42%">Attempts to find a match for the current expression 
-<td valign="top" width="42%">Attempts to find a match for the
+               somewhere in the text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-current expression somewhere in the text <i>p</i> using the match
+                  match flags</a>. Returns <i>true</i> if the match succeeds.</td>
 flags <i>flags</i> - see <a href="match_flag_type.html">match
 flags</a>. Returns <i>true</i> if the match succeeds.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>bool</b> Search(<b>const</b>
+            <td valign="top" width="43%"><b>bool</b> Search(<b>const</b> std::string&amp; s, 
-std::string&amp; s, <b>unsigned</b> <b>int</b> flags =
+               boost::match_flag_type flags = match_default) ;</td>
-match_default) ;</td>
+            <td valign="top" width="42%">Attempts to find a match for the current expression 
-<td valign="top" width="42%">Attempts to find a match for the
+               somewhere in the text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-current expression somewhere in the text <i>s</i> using the match
+                  match flags</a>. Returns <i>true</i> if the match succeeds.</td>
 flags <i>flags</i> - see <a href="match_flag_type.html">match
 flags</a>. Returns <i>true</i> if the match succeeds.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b>
-Grep(GrepCallback cb, <b>const</b> <b>char</b>* p, <b>unsigned</b>
+               <b>char</b>* p, boost::match_flag_type flags = match_default);</td>
-<b>int</b> flags = match_default);</td>
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-<td valign="top" width="42%">Finds all matches of the current
+               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-expression in the text <i>p</i> using the match flags <i>flags</i>
+                  match flags</a>. For each match found calls the call-back function <i>cb</i> 
- see <a href="match_flag_type.html">match flags</a>. For each
+               as: cb(*this);
-match found calls the call-back function <i>cb</i> as: cb(*this); 
+               <p>If at any stage the call-back function returns false then the grep operation 
-
+                  terminates, otherwise continues until no further matches are found. Returns the 
-<p>If at any stage the call-back function returns false then the
+                  number of matches found.</p>
 grep operation terminates, otherwise continues until no further
 matches are found. Returns the number of matches found.</p>
            </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(GrepCallback cb, <b>const</b>
-Grep(GrepCallback cb, <b>const</b> std::string&amp; s, <b>
+               std::string&amp; s, boost::match_flag_type flags = match_default);</td>
-unsigned</b> <b>int</b> flags = match_default);</td>
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-<td valign="top" width="42%">Finds all matches of the current
+               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-expression in the text <i>s</i> using the match flags <i>flags</i>
+                  match flags</a>. For each match found calls the call-back function <i>cb</i> 
- see <a href="match_flag_type.html">match flags</a>. For each
+               as: cb(*this);
-match found calls the call-back function <i>cb</i> as: cb(*this); 
+               <p>If at any stage the call-back function returns false then the grep operation 
-
+                  terminates, otherwise continues until no further matches are found. Returns the 
-<p>If at any stage the call-back function returns false then the
+                  number of matches found.</p>
 grep operation terminates, otherwise continues until no further
 matches are found. Returns the number of matches found.</p>
            </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; 
-Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b> <b>
+               v, <b>const</b> <b>char</b>* p, boost::match_flag_type flags = match_default);</td>
-char</b>* p, <b>unsigned</b> <b>int</b> flags =
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-match_default);</td>
+               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-<td valign="top" width="42%">Finds all matches of the current
+                  match flags</a>. For each match pushes a copy of what matched onto <i>v</i>. 
 expression in the text <i>p</i> using the match flags <i>flags</i>
 - see <a href="match_flag_type.html">match flags</a>. For each
 match pushes a copy of what matched onto <i>v</i>. Returns the
 number of matches found.</td>
 <td valign="top" width="7%">&nbsp;</td>
 </tr>
 <tr>
 <td valign="top" width="7%">&nbsp;</td>
 <td valign="top" width="43%"><b>unsigned</b> <b>int</b>
 Grep(std::vector&lt;std::string&gt;&amp; v, <b>const</b>
 std::string&amp; s, <b>unsigned</b> <b>int</b> flags =
 match_default);</td>
 <td valign="top" width="42%">Finds all matches of the current
 expression in the text <i>s</i> using the match flags <i>flags</i>
 - see <a href="match_flag_type.html">match flags</a>. For each
 match pushes a copy of what matched onto <i>v</i>. Returns the
 number of matches found.</td>
 <td valign="top" width="7%">&nbsp;</td>
 </tr>
 <tr>
 <td valign="top" width="7%">&nbsp;</td>
 <td valign="top" width="43%"><b>unsigned</b> <b>int</b>
 Grep(std::vector&lt;<b>unsigned int</b>&gt;&amp; v, <b>const</b>
 <b>char</b>* p, <b>unsigned</b> <b>int</b> flags =
 match_default);</td>
 <td valign="top" width="42%">Finds all matches of the current
 expression in the text <i>p</i> using the match flags <i>flags</i>
 - see <a href="match_flag_type.html">match flags</a>. For each
 match pushes the starting index of what matched onto <i>v</i>.
               Returns the number of matches found.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;std::string&gt;&amp; 
-Grep(std::vector&lt;<b>unsigned int</b>&gt;&amp; v, <b>const</b>
+               v, <b>const</b> std::string&amp; s, boost::match_flag_type flags = 
 std::string&amp; s, <b>unsigned</b> <b>int</b> flags =
               match_default);</td>
-<td valign="top" width="42%">Finds all matches of the current
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-expression in the text <i>s</i> using the match flags <i>flags</i>
+               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
- see <a href="match_flag_type.html">match flags</a>. For each
+                  match flags</a>. For each match pushes a copy of what matched onto <i>v</i>. 
 match pushes the starting index of what matched onto <i>v</i>.
               Returns the number of matches found.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned 
-GrepFiles(GrepFileCallback cb, <b>const</b> <b>char</b>* files, <b>
+                  int</b>&gt;&amp; v, <b>const</b> <b>char</b>* p, boost::match_flag_type 
 bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>int</b> flags =
 match_default);</td>
 <td valign="top" width="42%">Finds all matches of the current
 expression in the files <i>files</i> using the match flags <i>
 flags</i> - see <a href="match_flag_type.html">match flags</a>. For
 each match calls the call-back function cb.&nbsp; 
 <p>If the call-back returns false then the algorithm returns
 without considering further matches in the current file, or any
 further files.&nbsp;</p>
 <p>The parameter <i>files</i> can include wild card characters '*'
 and '?', if the parameter <i>recurse</i> is true then searches
 sub-directories for matching file names.&nbsp;</p>
 <p>Returns the total number of matches found.</p>
 <p>May throw an exception derived from std::runtime_error if file
 io fails.</p>
 </td>
 <td valign="top" width="7%">&nbsp;</td>
 </tr>
 <tr>
 <td valign="top" width="7%">&nbsp;</td>
 <td valign="top" width="43%"><b>unsigned</b> <b>int</b>
 GrepFiles(GrepFileCallback cb, <b>const</b> std::string&amp; files,
 <b>bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>int</b>
               flags = match_default);</td>
-<td valign="top" width="42%">Finds all matches of the current
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-expression in the files <i>files</i> using the match flags <i>
+               text <i>p</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-flags</i> - see <a href="match_flag_type.html">match flags</a>. For
+                  match flags</a>. For each match pushes the starting index of what matched 
-each match calls the call-back function cb.&nbsp; 
+               onto <i>v</i>. Returns the number of matches found.</td>
 <p>If the call-back returns false then the algorithm returns
 without considering further matches in the current file, or any
 further files.&nbsp;</p>
 <p>The parameter <i>files</i> can include wild card characters '*'
 and '?', if the parameter <i>recurse</i> is true then searches
 sub-directories for matching file names.&nbsp;</p>
 <p>Returns the total number of matches found.</p>
 <p>May throw an exception derived from std::runtime_error if file
 io fails.</p>
 </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Grep(std::vector&lt;<b>unsigned 
-FindFiles(FindFilesCallback cb, <b>const</b> <b>char</b>* files,
+                  int</b>&gt;&amp; v, <b>const</b> std::string&amp; s, boost::match_flag_type 
 <b>bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>int</b>
               flags = match_default);</td>
-<td valign="top" width="42%">Searches <i>files</i> to find all
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-those which contain at least one match of the current expression
+               text <i>s</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-using the match flags <i>flags</i> - see <a href="match_flag_type.html">match flags</a>. For each matching file
+                  match flags</a>. For each match pushes the starting index of what matched 
-calls the call-back function cb.&nbsp; 
+               onto <i>v</i>. Returns the number of matches found.</td>
-
+            <td valign="top" width="7%">&nbsp;</td>
-<p>If the call-back returns false then the algorithm returns
+         </tr>
-without considering any further files.&nbsp;</p>
+         <tr>
-
+            <td valign="top" width="7%">&nbsp;</td>
-<p>The parameter <i>files</i> can include wild card characters '*'
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback 
-and '?', if the parameter <i>recurse</i> is true then searches
+               cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, 
-sub-directories for matching file names.&nbsp;</p>
+               boost::match_flag_type flags = match_default);</td>
-
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-<p>Returns the total number of files found.</p>
+               files <i>files</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-
+                  match flags</a>. For each match calls the call-back function cb.&nbsp;
-<p>May throw an exception derived from std::runtime_error if file
+               <p>If the call-back returns false then the algorithm returns without considering 
-io fails.</p>
+                  further matches in the current file, or any further files.&nbsp;</p>
               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
                  parameter <i>recurse</i> is true then searches sub-directories for matching 
                  file names.&nbsp;</p>
               <p>Returns the total number of matches found.</p>
               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
            </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> GrepFiles(GrepFileCallback 
-FindFiles(FindFilesCallback cb, <b>const</b> std::string&amp;
+               cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, 
-files, <b>bool</b> recurse = <b>false</b>, <b>unsigned</b> <b>
+               boost::match_flag_type flags = match_default);</td>
-int</b> flags = match_default);</td>
+            <td valign="top" width="42%">Finds all matches of the current expression in the 
-<td valign="top" width="42%">Searches <i>files</i> to find all
+               files <i>files</i> using the match flags <i>flags</i> - see <a href="match_flag_type.html">
-those which contain at least one match of the current expression
+                  match flags</a>. For each match calls the call-back function cb.&nbsp;
-using the match flags <i>flags</i> - see <a href="match_flag_type.html">match flags</a>. For each matching file
+               <p>If the call-back returns false then the algorithm returns without considering 
-calls the call-back function cb.&nbsp; 
+                  further matches in the current file, or any further files.&nbsp;</p>
-
+               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
-<p>If the call-back returns false then the algorithm returns
+                  parameter <i>recurse</i> is true then searches sub-directories for matching 
-without considering any further files.&nbsp;</p>
+                  file names.&nbsp;</p>
-
+               <p>Returns the total number of matches found.</p>
-<p>The parameter <i>files</i> can include wild card characters '*'
+               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
 and '?', if the parameter <i>recurse</i> is true then searches
 sub-directories for matching file names.&nbsp;</p>
 <p>Returns the total number of files found.</p>
 <p>May throw an exception derived from std::runtime_error if file
 io fails.</p>
            </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">std::string Merge(<b>const</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback 
-std::string&amp; in, <b>const</b> std::string&amp; fmt, <b>bool</b>
+               cb, <b>const</b> <b>char</b>* files, <b>bool</b> recurse = <b>false</b>, 
-copy = <b>true</b>, <b>unsigned</b> <b>int</b> flags =
+               boost::match_flag_type flags = match_default);</td>
            <td valign="top" width="42%">Searches <i>files</i> to find all those which contain 
               at least one match of the current expression using the match flags <i>flags</i> 
               - see <a href="match_flag_type.html">match flags</a>. For each matching file 
               calls the call-back function cb.&nbsp;
               <p>If the call-back returns false then the algorithm returns without considering 
                  any further files.&nbsp;</p>
               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
                  parameter <i>recurse</i> is true then searches sub-directories for matching 
                  file names.&nbsp;</p>
               <p>Returns the total number of files found.</p>
               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
            </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> FindFiles(FindFilesCallback 
               cb, <b>const</b> std::string&amp; files, <b>bool</b> recurse = <b>false</b>, 
               boost::match_flag_type flags = match_default);</td>
            <td valign="top" width="42%">Searches <i>files</i> to find all those which contain 
               at least one match of the current expression using the match flags <i>flags</i> 
               - see <a href="match_flag_type.html">match flags</a>. For each matching file 
               calls the call-back function cb.&nbsp;
               <p>If the call-back returns false then the algorithm returns without considering 
                  any further files.&nbsp;</p>
               <p>The parameter <i>files</i> can include wild card characters '*' and '?', if the 
                  parameter <i>recurse</i> is true then searches sub-directories for matching 
                  file names.&nbsp;</p>
               <p>Returns the total number of files found.</p>
               <p>May throw an exception derived from std::runtime_error if file io fails.</p>
            </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
            <td valign="top" width="43%">std::string Merge(<b>const</b> std::string&amp; in, <b>const</b>
               std::string&amp; fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type 
               flags = match_default);</td>
            <td valign="top" width="42%">Performs a search and replace operation: searches 
               through the string <i>in</i> for all occurrences of the current expression, for 
               each occurrence replaces the match with the format string <i>fmt</i>. Uses <i>flags</i>
               to determine what gets matched, and how the format string should be treated. If <i>
                  copy</i> is true then all unmatched sections of input are copied unchanged 
               to output, if the flag <em>format_first_only</em> is set then only the first 
               occurance of the pattern found is replaced. Returns the new string. See <a href="format_syntax.html">
                  also format string syntax</a>, <a href="match_flag_type.html">match flags</a>
               and <a href="match_flag_type.html">format flags</a>.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
            <td valign="top" width="43%">std::string Merge(<b>const</b> char* in, <b>const</b> 
               char* fmt, <b>bool</b> copy = <b>true</b>, boost::match_flag_type flags = 
               match_default);</td>
-<td valign="top" width="42%">Performs a search and replace
+            <td valign="top" width="42%">Performs a search and replace operation: searches 
-operation: searches through the string <i>in</i> for all
+               through the string <i>in</i> for all occurrences of the current expression, for 
-occurrences of the current expression, for each occurrence replaces
+               each occurrence replaces the match with the format string <i>fmt</i>. Uses <i>flags</i>
-the match with the format string <i>fmt</i>. Uses <i>flags</i> to
+               to determine what gets matched, and how the format string should be treated. If <i>
-determine what gets matched, and how the format string should be
+                  copy</i> is true then all unmatched sections of input are copied unchanged 
-treated. If <i>copy</i> is true then all unmatched sections of
+               to output, if the flag <em>format_first_only</em> is set then only the first 
-input are copied unchanged to output, if the flag <em>
+               occurance of the pattern found is replaced. Returns the new string. See <a href="format_syntax.html">
-format_first_only</em> is set then only the first occurance of the
+                  also format string syntax</a>, <a href="match_flag_type.html">match flags</a>
-pattern found is replaced. Returns the new string. See <a href="format_syntax.html">also format string syntax</a>, <a href="match_flag_type.html">match flags</a> and <a href="match_flag_type.html">format flags</a>.</td>
+               and <a href="match_flag_type.html">format flags</a>.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
 <tr>
 <td valign="top" width="7%">&nbsp;</td>
 <td valign="top" width="43%">std::string Merge(<b>const</b> char*
 in, <b>const</b> char* fmt, <b>bool</b> copy = <b>true</b>, <b>
 unsigned int</b> flags = match_default);</td>
 <td valign="top" width="42%">Performs a search and replace
 operation: searches through the string <i>in</i> for all
 occurrences of the current expression, for each occurrence replaces
 the match with the format string <i>fmt</i>. Uses <i>flags</i> to
 determine what gets matched, and how the format string should be
 treated. If <i>copy</i> is true then all unmatched sections of
 input are copied unchanged to output, if the flag <em>
 format_first_only</em> is set then only the first occurance of the
 pattern found is replaced. Returns the new string. See <a href="format_syntax.html">also format string syntax</a>, <a href="match_flag_type.html">match flags</a> and <a href="match_flag_type.html">format flags</a>.</td>
 <td valign="top" width="7%">&nbsp;</td>
 </tr>
         <tr>
            <td>&nbsp;</td>
-<td valign="top"><b>unsigned</b>
+            <td valign="top"><b>unsigned</b> Split(std::vector&lt;std::string&gt;&amp; v, 
-Split(std::vector&lt;std::string&gt;&amp; v, std::string&amp; s,
+               std::string&amp; s, boost::match_flag_type flags = match_default, <b>unsigned</b>
-<b>unsigned</b> flags = match_default, <b>unsigned</b> max_count =
+               max_count = ~0);</td>
-~0);</td>
+            <td valign="top">Splits the input string and pushes each one onto the vector. If 
-<td valign="top">Splits the input string and pushes each one onto
+               the expression contains no marked sub-expressions, then one string is outputted 
-the vector. If the expression contains no marked sub-expressions,
+               for each section of the input that does not match the expression. If the 
-then one string is outputted for each section of the input that
+               expression does contain marked sub-expressions, then outputs one string for 
-does not match the expression. If the expression does contain
+               each marked sub-expression each time a match occurs. Outputs no more than <i>max_count</i>
-marked sub-expressions, then outputs one string for each marked
+               strings. Before returning, deletes from the input string <i>s</i> all of the 
-sub-expression each time a match occurs. Outputs no more than <i>
+               input that has been processed (all of the string if <i>max_count</i> was not 
-max_count</i> strings. Before returning, deletes from the input
+               reached). Returns the number of strings pushed onto the vector.</td>
 string <i>s</i> all of the input that has been processed (all of
 the string if <i>max_count</i> was not reached). Returns the number
 of strings pushed onto the vector.</td>
            <td>&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Position(<b>int</b> i = 0)<b>const</b>;</td>
-Position(<b>int</b> i = 0)<b>const</b>;</td>
+            <td valign="top" width="42%">Returns the position of what matched sub-expression <i>i</i>. 
-<td valign="top" width="42%">Returns the position of what matched
+               If <i>i = 0</i> then returns the position of the whole match. Returns 
-sub-expression <i>i</i>. If <i>i = 0</i> then returns the position
+               RegEx::npos if the supplied index is invalid, or if the specified 
-of the whole match. Returns RegEx::npos if the supplied index is
+               sub-expression did not participate in the match.</td>
 invalid, or if the specified sub-expression did not participate in
 the match.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Length(<b>int</b> i = 0)<b>const</b>;</td>
-Length(<b>int</b> i = 0)<b>const</b>;</td>
+            <td valign="top" width="42%">Returns the length of what matched sub-expression <i>i</i>. 
-<td valign="top" width="42%">Returns the length of what matched
+               If <i>i = 0</i> then returns the length of the whole match. Returns RegEx::npos 
-sub-expression <i>i</i>. If <i>i = 0</i> then returns the length of
+               if the supplied index is invalid, or if the specified sub-expression did not 
-the whole match. Returns RegEx::npos if the supplied index is
+               participate in the match.</td>
 invalid, or if the specified sub-expression did not participate in
 the match.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td>&nbsp;</td>
-<td><strong>bool</strong> Matched(<strong>int</strong> i =
+            <td><strong>bool</strong> Matched(<strong>int</strong> i = 0)<strong>const</strong>;</td>
-0)<strong>const</strong>;</td>
+            <td>Returns true if sub-expression <em>i</em> was matched, false otherwise.</td>
 <td>Returns true if sub-expression <em>i</em> was matched, false
 otherwise.</td>
            <td>&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned</b> <b>int</b>
+            <td valign="top" width="43%"><b>unsigned</b> <b>int</b> Line()<b>const</b>;</td>
-Line()<b>const</b>;</td>
+            <td valign="top" width="42%">Returns the line on which the match occurred, indexes 
-<td valign="top" width="42%">Returns the line on which the match
+               start from 1 not zero, if no match occurred then returns RegEx::npos.</td>
 occurred, indexes start from 1 not zero, if no match occurred then
 returns RegEx::npos.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%"><b>unsigned int</b> Marks()
+            <td valign="top" width="43%"><b>unsigned int</b> Marks() const;</td>
-const;</td>
+            <td valign="top" width="42%">Returns the number of marked sub-expressions 
-<td valign="top" width="42%">Returns the number of marked
+               contained in the expression. Note that this includes the whole match 
-sub-expressions contained in the expression. Note that this
+               (sub-expression zero), so the value returned is always &gt;= 1.</td>
 includes the whole match (sub-expression zero), so the value
 returned is always &gt;= 1.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">std::string What(<b>int</b>
+            <td valign="top" width="43%">std::string What(<b>int</b> i)<b>const</b>;</td>
-i)<b>const</b>;</td>
+            <td valign="top" width="42%">Returns a copy of what matched sub-expression <i>i</i>. 
-<td valign="top" width="42%">Returns a copy of what matched
+               If <i>i = 0</i> then returns a copy of the whole match. Returns a null string 
-sub-expression <i>i</i>. If <i>i = 0</i> then returns a copy of the
+               if the index is invalid or if the specified sub-expression did not participate 
-whole match. Returns a null string if the index is invalid or if
+               in a match.</td>
 the specified sub-expression did not participate in a match.</td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
         <tr>
            <td valign="top" width="7%">&nbsp;</td>
-<td valign="top" width="43%">std::string <b>
+            <td valign="top" width="43%">std::string <b>operator</b>[](<b>int</b> i)<b>const</b>
-operator</b>[](<b>int</b> i)<b>const</b> ;</td>
+               ;</td>
            <td valign="top" width="42%">Returns <i>what(i);</i>
-
+               <p>Can be used to simplify access to sub-expression matches, and make usage more 
-<p>Can be used to simplify access to sub-expression matches, and
+                  perl-like.</p>
 make usage more perl-like.</p>
            </td>
            <td valign="top" width="7%">&nbsp;</td>
         </tr>
      </table>
      <br>
      <br>
      <p></p>
      <hr>
      <p>Revised 
         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         04 Feb 2004 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
   </body>
 </html>
--- a/doc/regex_grep.html
+++ b/doc/regex_grep.html
@@ -42,7 +42,7 @@
                         iterator first,
                         iterator last,
                         <b>const</b> basic_regex&lt;charT, traits, Allocator&gt;&amp; e,
-                         <b>unsigned</b> flags = match_default)
+                         boost::match_flag_type flags = match_default)
 </pre>
      <p>The library also defines the following convenience versions, which take either 
         a const charT*, or a const std::basic_string&lt;&gt;&amp; in place of a pair of 
@@ -53,13 +53,13 @@
 <b>unsigned</b> <b>int</b> regex_grep(Predicate foo, 
              <b>const</b> charT* str, 
              <b>const</b> basic_regex&lt;charT, traits, Allocator&gt;&amp; e, 
-              <b>unsigned</b> flags = match_default);
+              boost::match_flag_type flags = match_default);
 <b>template</b> &lt;<b>class</b> Predicate, <b>class</b> ST, <b>class</b> SA, <b>class</b> Allocator, <b>class</b> charT, <b>class</b> traits&gt;
 <b>unsigned</b> <b>int</b> regex_grep(Predicate foo, 
              <b>const</b> std::basic_string&lt;charT, ST, SA&gt;&amp; s, 
              <b>const</b> basic_regex&lt;charT, traits, Allocator&gt;&amp; e, 
-              <b>unsigned</b> flags = match_default);
+              boost::match_flag_type flags = match_default);
 </pre>
      <p>The parameters for the primary version of regex_grep have the following 
         meanings:&nbsp;</p>
@@ -370,11 +370,10 @@ index[std::string(what[5].first, what[5].second) + std::string(what[6].first, wh
      <hr>
      <p>Revised 
         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         04 Feb 2004 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
--- a/doc/regex_search.html
+++ b/doc/regex_search.html
@@ -294,7 +294,7 @@ void</B> IndexClasses(map_type&amp; m, <B>const</B> std::string&amp; file)
 &nbsp;&nbsp; start = file.begin(); 
 &nbsp;&nbsp; end = file.end();&nbsp;
 &nbsp;&nbsp; &nbsp;&nbsp; boost::<a href="match_results.html">match_results</a>&lt;std::string::const_iterator&gt; what; 
-&nbsp;&nbsp; <B>unsigned</B> <B>int</B> flags = boost::match_default; 
+&nbsp;&nbsp; boost::match_flag_type flags = boost::match_default; 
 &nbsp;&nbsp; <B>while</B>(regex_search(start, end, what, expression, flags))&nbsp;
 &nbsp;&nbsp; { 
 <FONT color=#000080>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <I>// what[0] contains the whole string 
@@ -314,11 +314,10 @@ void</B> IndexClasses(map_type&amp; m, <B>const</B> std::string&amp; file)
      <HR>
      <p>Revised 
         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         04 Feb 2004 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
--- a/doc/regex_split.html
+++ b/doc/regex_split.html
@@ -38,15 +38,15 @@
      <PRE><B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2, <B>class</B> Alloc2&gt;
 std::size_t regex_split(OutputIterator out,&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::basic_string&lt;charT, Traits1, Alloc1&gt;&amp; s,&nbsp;
-&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; const</B> basic_regex&lt;charT, Traits2, Alloc2&gt;&amp; e,
+&nbsp;<B> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2, Alloc2&gt;&amp; e,
-&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; unsigned</B> flags,
+&nbsp;<STRONG>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</STRONG>boost::match_flag_type flags,
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::size_t max_split);
 <B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2, <B>class</B> Alloc2&gt;
 std::size_t regex_split(OutputIterator out,&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::basic_string&lt;charT, Traits1, Alloc1&gt;&amp; s,&nbsp;
-&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; const</B> basic_regex&lt;charT, Traits2, Alloc2&gt;&amp; e,
+&nbsp;<B> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2, Alloc2&gt;&amp; e,
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <B>unsigned</B> flags = match_default);
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; boost::match_flag_type flags = match_default);
 <B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1&gt;
 std::size_t regex_split(OutputIterator out, 
@@ -134,11 +134,10 @@ boost::regex e(<FONT color=#000080>"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)
      <HR>
      <p>Revised 
         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         04 Feb 2004 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
--- a/doc/regex_token_iterator.html
+++ b/doc/regex_token_iterator.html
@@ -76,7 +76,7 @@ typedef regex_token_iterator&lt;const char*&gt;                   cregex_token_i
 typedef regex_token_iterator&lt;std::string::const_iterator&gt;   sregex_token_iterator;
 #ifndef BOOST_NO_WREGEX
 typedef regex_token_iterator&lt;const wchar_t*&gt;                wcregex_token_iterator;
-typedef regex_token_iterator<&lt;std::wstring::const_iterator&gt; wsregex_token_iterator;
+typedef regex_token_iterator&lt;&lt;std::wstring::const_iterator&gt; wsregex_token_iterator;
 #endif
 </PRE>
      <H3><A name="description"></A>Description</H3>
@@ -84,7 +84,8 @@ typedef regex_token_iterator<&lt;std::wstring::const_iterator&gt; wsregex_token_
      <P><B> Effects:</B> constructs an end of sequence iterator.</P>
      <PRE><A name=c2></A>regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
                     int submatch = 0, match_flag_type m = match_default);</PRE>
-      <P><B> Preconditions: </B><CODE>!re.empty()</CODE>.</P>
+      <P><B> Preconditions: </B><CODE>!re.empty()</CODE>.&nbsp; Object re shall exist 
         for the lifetime of the iterator constructed from it.</P>
      <P><B> Effects:</B> constructs a regex_token_iterator that will enumerate one 
         string for each regular expression match of the expression <EM>re</EM> found 
         within the sequence <EM>[a,b)</EM>, using match flags <EM>m</EM>.&nbsp; The 
@@ -99,7 +100,8 @@ typedef regex_token_iterator<&lt;std::wstring::const_iterator&gt; wsregex_token_
            configured</A> in non-recursive mode).</P>
      <PRE><A name=c3></A>regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
                     const std::vector&lt;int&gt;&amp; submatches, match_flag_type m = match_default);</PRE>
-      <P><B> Preconditions:</B> <CODE>submatches.size() &amp;&amp; !re.empty()</CODE>.</P>
+      <P><B> Preconditions:</B> <CODE>submatches.size() &amp;&amp; !re.empty()</CODE>.&nbsp; 
         Object re shall exist for the lifetime of the iterator constructed from it.</P>
      <P><B> Effects:</B> constructs a regex_token_iterator that will enumerate <EM>submatches.size()</EM>
         strings for each regular expression match of the expression <EM>re</EM> found 
         within the sequence <EM>[a,b)</EM>, using match flags <EM>m</EM>.&nbsp; For 
@@ -118,7 +120,8 @@ typedef regex_token_iterator<&lt;std::wstring::const_iterator&gt; wsregex_token_
      <PRE><A name=c4></A>template &lt;std::size_t N&gt;
 regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type&amp; re, 
                     const int (&amp;submatches)[R], match_flag_type m = match_default);</PRE>
-      <P><B> Preconditions: </B><CODE>!re.empty()</CODE>.</P>
+      <P><B> Preconditions: </B><CODE>!re.empty()</CODE>.&nbsp; Object re shall exist 
         for the lifetime of the iterator constructed from it.</P>
      <P><STRONG>Effects:</STRONG></B> constructs a regex_token_iterator that will 
         enumerate&nbsp;<EM>R</EM> strings for each regular expression match of the 
         expression <EM>re</EM> found within the sequence <EM>[a,b)</EM>, using match 
--- a/doc/regex_traits.html
+++ b/doc/regex_traits.html
@@ -24,10 +24,12 @@
      </P>
      <HR>
      <p></p>
-      <P>Under construction.</P>
+      <P>
-      <P>The current boost.regex traits class design will be migrated to that specified 
+         Under construction: the current design will be replaced by that specified in 
-         in the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">regular 
+         the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">regular 
-            expression standardization proposal</A>.&nbsp;</P>
+            expression standardization proposal</A>, the current (obsolete) design has 
         it's <A href="http://cvs.sourceforge.net/viewcvs.py/*checkout*/boost/boost/libs/regex/Attic/traits_class_ref.htm?rev=1.11">
            documentation archived online</A>.</P>
      <P>
         <HR>
      <P></P>
@@ -36,11 +38,9 @@
         24 Oct 2003 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
   </body>
 </html>
--- a/doc/syntax.html
+++ b/doc/syntax.html
@@ -91,18 +91,18 @@
      <P>Parentheses serve two purposes, to group items together into a sub-expression, 
         and to mark what generated the match. For example the expression "(ab)*" would 
         match all of the string "ababab". The matching algorithms <A href="regex_match.html">
-            regex_match</A> and <A href="regex_search.html">regex_search</A>
+            regex_match</A> and <A href="regex_search.html">regex_search</A> each take 
-         each take an instance of <A href="match_results.html">match_results</A>
+         an instance of <A href="match_results.html">match_results</A> that reports what 
-         that reports what caused the match, on exit from these functions the <A href="match_results.html">
+         caused the match, on exit from these functions the <A href="match_results.html">match_results</A>
-            match_results</A> contains information both on what the whole expression 
+         contains information both on what the whole expression matched and on what each 
-         matched and on what each sub-expression matched. In the example above 
+         sub-expression matched. In the example above match_results[1] would contain a 
-         match_results[1] would contain a pair of iterators denoting the final "ab" of 
+         pair of iterators denoting the final "ab" of the matching string. It is 
-         the matching string. It is permissible for sub-expressions to match null 
+         permissible for sub-expressions to match null strings. If a sub-expression 
-         strings. If a sub-expression takes no part in a match - for example if it is 
+         takes no part in a match - for example if it is part of an alternative that is 
-         part of an alternative that is not taken - then both of the iterators that are 
+         not taken - then both of the iterators that are returned for that 
-         returned for that sub-expression point to the end of the input string, and the <I>matched</I>
+         sub-expression point to the end of the input string, and the <I>matched</I> parameter 
-         parameter for that sub-expression is <I>false</I>. Sub-expressions are indexed 
+         for that sub-expression is <I>false</I>. Sub-expressions are indexed from left 
-         from left to right starting from 1, sub-expression 0 is the whole expression.
+         to right starting from 1, sub-expression 0 is the whole expression.
      </P>
      <H3>Non-Marking Parenthesis
      </H3>
@@ -143,7 +143,7 @@
      <P>A set is a set of characters that can match any single character that is a 
         member of the set. Sets are delimited by "[" and "]" and can contain literals, 
         character ranges, character classes, collating elements and equivalence 
-         classes. Set declarations that start with "^" contain the compliment of the 
+         classes. Set declarations that start with "^" contain the complement of the 
         elements that follow.
      </P>
      <P>Examples:
@@ -682,7 +682,8 @@
         chosen is the one with the longest first sub-expression, if that is the same 
         for two or more matches, then the second sub-expression will be examined and so 
         on.
-      </P><P>
+      </P>
      <P>
         The following table examples illustrate the main differences between Perl and 
         POSIX regular expression matching rules:
      </P>
@@ -708,24 +709,23 @@
                     <P><CODE>a|ab</CODE></P>
                  </TD>
                  <TD vAlign="top" width="25%">
-                  <P><CODE>
+                     <P><CODE> xaby</CODE>
                  xaby</CODE>
                     </P>
                  </TD>
                  <TD vAlign="top" width="25%">
-            <P><CODE>
+                     <P><CODE> "ab"</CODE></P>
-            "ab"</CODE></P></TD>
+                  </TD>
                  <TD vAlign="top" width="25%">
-            <P><CODE>
+                     <P><CODE> "a"</CODE></P>
-            "a"</CODE></P></TD>
+                  </TD>
               </TR>
               <TR>
                  <TD vAlign="top" width="25%">
-               <P><CODE>
+                     <P><CODE> .*([[:alnum:]]+).*</CODE></P>
-               .*([[:alnum:]]+).*</CODE></P></TD>
+                  </TD>
                  <TD vAlign="top" width="25%">
-               <P><CODE>
+                     <P><CODE> " abc def xyz "</CODE></P>
-               " abc def xyz "</CODE></P></TD>
+                  </TD>
                  <TD vAlign="top" width="25%">
                     <P>$0 = " abc def xyz "<BR>
                        $1 = "abc"</P>
@@ -737,14 +737,14 @@
               </TR>
               <TR>
                  <TD vAlign="top" width="25%">
-               <P><CODE>
+                     <P><CODE> .*(a|xayy)</CODE></P>
-               .*(a|xayy)</CODE></P></TD>
+                  </TD>
                  <TD vAlign="top" width="25%">
-               <P><CODE>
+                     <P><CODE> zzxayyzz</CODE></P>
-               zzxayyzz</CODE></P></TD>
+                  </TD>
                  <TD vAlign="top" width="25%">
-               <P><CODE>
+                     <P><CODE> "zzxayy"</CODE></P>
-               "zzxayy"</CODE></P></TD>
+                  </TD>
                  <TD vAlign="top" width="25%">
                     <P><CODE>"zzxa"</CODE></P>
                  </TD>
@@ -753,19 +753,16 @@
      <P>These differences between Perl matching rules, and POSIX matching rules, mean 
         that these two regular expression syntaxes differ not only in the features 
         offered, but also in the form that the state machine takes and/or the 
-         algorithms used to traverse the state machine.</p>
+         algorithms used to traverse the state machine.</P>
      <HR>
      <p>Revised 
         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
         24 Oct 2003 
         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
      <p><i><EFBFBD> Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
      <P><I>Use, modification and distribution are subject to the Boost Software License, 
            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
   </body>
 </html>
--- a/include/boost/regex/v4/cregex.hpp
+++ b/include/boost/regex/v4/cregex.hpp
@@ -252,7 +252,7 @@ public:
   std::string What(int i = 0)const;
   std::string operator[](int i)const { return What(i); }
-   static const unsigned int npos;
+   static const std::size_t npos;
   friend struct re_detail::pred1;
   friend struct re_detail::pred2;
--- a/include/boost/regex/v4/match_flags.hpp
+++ b/include/boost/regex/v4/match_flags.hpp
@@ -72,7 +72,7 @@ typedef enum _match_flags
 } match_flags;
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) || defined(__SUNPRO_CC)
 typedef unsigned long match_flag_type;
 #else
 typedef match_flags match_flag_type;
@@ -88,11 +88,11 @@ inline match_flags operator^(match_flags m1, match_flags m2)
 inline match_flags operator~(match_flags m1)
 { return static_cast<match_flags>(~static_cast<boost::int32_t>(m1)); }
 inline match_flags& operator&=(match_flags& m1, match_flags m2)
-{ m1 = m1&m2; return m1; }
+{ m1 = static_cast<match_flags>(m1&m2); return m1; }
 inline match_flags& operator|=(match_flags& m1, match_flags m2)
-{ m1 = m1|m2; return m1; }
+{ m1 = static_cast<match_flags>(m1|m2); return m1; }
 inline match_flags& operator^=(match_flags& m1, match_flags m2)
-{ m1 = m1^m2; return m1; }
+{ m1 = static_cast<match_flags>(m1^m2); return m1; }
 #endif
 #endif
--- a/include/boost/regex/v4/perl_matcher_common.hpp
+++ b/include/boost/regex/v4/perl_matcher_common.hpp
@@ -54,7 +54,7 @@ perl_matcher<BidiIterator, Allocator, traits, Allocator2>::perl_matcher(BidiIter
   estimate_max_state_count(static_cast<category*>(0));
   if(!(m_match_flags & (match_perl|match_posix)))
   {
-      if(re.flags() & regex_constants::perlex)
+      if((re.flags() & regex_constants::perlex) || (re.flags() & regex_constants::literal))
         m_match_flags |= match_perl;
      else
         m_match_flags |= match_posix;
@@ -82,7 +82,7 @@ void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::estimate_max_sta
   if(dist > (difference_type)(lim / states))
      max_state_count = lim;
   else
-      max_state_count = 1000 + states * dist;
+      max_state_count = 100000 + states * dist;
 }
 template <class BidiIterator, class Allocator, class traits, class Allocator2>
 void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::estimate_max_state_count(void*)
@@ -205,10 +205,10 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_imp()
   else
   {
      // start again:
-      search_base = position = (*m_presult)[0].second;
+      search_base = position = m_result[0].second;
      // If last match was null and match_not_null was not set then increment
      // our start position, otherwise we go into an infinite loop:
-      if(((m_match_flags & match_not_null) == 0) && (m_presult->length() == 0))
+      if(((m_match_flags & match_not_null) == 0) && (m_result.length() == 0))
      {
         if(position == last)
            return false;
--- a/include/boost/regex/v4/perl_matcher_non_recursive.hpp
+++ b/include/boost/regex/v4/perl_matcher_non_recursive.hpp
@@ -38,7 +38,13 @@ inline void inplace_destroy(T* p)
 struct saved_state
 {
   union{
      unsigned int id;
      // these ensure that this struct gets the same alignment as derived structs:
      void* padding1;
      std::size_t padding2;
      std::ptrdiff_t padding3;
   };
   saved_state(unsigned i) : id(i) {}
 };
@@ -927,8 +933,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_greedy_si
   const re_repeat* rep = pmp->rep;
   unsigned count = pmp->count;
-   assert(rep->next.p);
+   assert(rep->next.p != 0);
-   assert(rep->alt.p);
+   assert(rep->alt.p != 0);
   count -= rep->min;
@@ -977,8 +983,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_slow_dot_
   const re_repeat* rep = pmp->rep;
   unsigned count = pmp->count;
   assert(rep->type == syntax_element_dot_rep);
-   assert(rep->next.p);
+   assert(rep->next.p != 0);
-   assert(rep->alt.p);
+   assert(rep->alt.p != 0);
   assert(rep->next.p->type == syntax_element_wild);
   assert(count < rep->max);
@@ -1005,7 +1011,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_slow_dot_
   {
      // can't repeat any more, remove the pushed state: 
      destroy_single_repeat();
-      if(rep->can_be_null & mask_skip)
+      if(0 == (rep->can_be_null & mask_skip))
         return true;
   }
   else if(count == rep->max)
@@ -1057,7 +1063,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_fast_dot_
   {
      // can't repeat any more, remove the pushed state: 
      destroy_single_repeat();
-      if(rep->can_be_null & mask_skip)
+      if(0 == (rep->can_be_null & mask_skip))
         return true;
   }
   else if(count == rep->max)
@@ -1095,8 +1101,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_char_repe
   position = pmp->last_position;
   assert(rep->type == syntax_element_char_rep);
-   assert(rep->next.p);
+   assert(rep->next.p != 0);
-   assert(rep->alt.p);
+   assert(rep->alt.p != 0);
   assert(rep->next.p->type == syntax_element_literal);
   assert(count < rep->max);
@@ -1121,7 +1127,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_char_repe
   {
      // can't repeat any more, remove the pushed state: 
      destroy_single_repeat();
-      if(rep->can_be_null & mask_skip)
+      if(0 == (rep->can_be_null & mask_skip))
         return true;
   }
   else if(count == rep->max)
@@ -1159,8 +1165,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_short_set
   position = pmp->last_position;
   assert(rep->type == syntax_element_short_set_rep);
-   assert(rep->next.p);
+   assert(rep->next.p != 0);
-   assert(rep->alt.p);
+   assert(rep->alt.p != 0);
   assert(rep->next.p->type == syntax_element_set);
   assert(count < rep->max);
@@ -1185,7 +1191,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_short_set
   {
      // can't repeat any more, remove the pushed state: 
      destroy_single_repeat();
-      if(rep->can_be_null & mask_skip)
+      if(0 == (rep->can_be_null & mask_skip))
         return true;
   }
   else if(count == rep->max)
@@ -1223,8 +1229,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_long_set_
   position = pmp->last_position;
   assert(rep->type == syntax_element_long_set_rep);
-   assert(rep->next.p);
+   assert(rep->next.p != 0);
-   assert(rep->alt.p);
+   assert(rep->alt.p != 0);
   assert(rep->next.p->type == syntax_element_long_set);
   assert(position != last);
   assert(count < rep->max);
@@ -1250,7 +1256,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_long_set_
   {
      // can't repeat any more, remove the pushed state:
      destroy_single_repeat();
-      if(rep->can_be_null & mask_skip)
+      if(0 == (rep->can_be_null & mask_skip))
         return true;
   }
   else if(count == rep->max)
--- a/include/boost/regex/v4/perl_matcher_recursive.hpp
+++ b/include/boost/regex/v4/perl_matcher_recursive.hpp
@@ -400,7 +400,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat
   // start by working out how much we can skip:
   //
   const re_repeat* rep = static_cast<const re_repeat*>(pstate);
-   unsigned count = std::min(static_cast<unsigned>(re_detail::distance(position, last)), (rep->greedy ? rep->max : rep->min));
+   unsigned count = (std::min)(static_cast<unsigned>(re_detail::distance(position, last)), (rep->greedy ? rep->max : rep->min));
   if(rep->min > count)
      return false;  // not enough text left to match
   std::advance(position, count);
@@ -458,7 +458,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_char_repea
   if(::boost::is_random_access_iterator<BidiIterator>::value)
   {
      BidiIterator end = position;
-      std::advance(end, std::min((unsigned)re_detail::distance(position, last), desired));
+      std::advance(end, (std::min)((unsigned)re_detail::distance(position, last), desired));
      BidiIterator origin(position);
      while((position != end) && (traits_inst.translate(*position, icase) == what))
      {
@@ -507,8 +507,16 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_char_repea
         return false;
      if(position == last)
         return false;
-      position = ++save_pos;
+      position = save_pos;
      if(traits_inst.translate(*position, icase) == what)
      {
         ++position;
         ++count;
      }
      else
      {
         return false;
      }
   }while(true);
 #ifdef __BORLANDC__
 #pragma option pop
@@ -538,7 +546,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set_repeat
   if(::boost::is_random_access_iterator<BidiIterator>::value)
   {
      BidiIterator end = position;
-      std::advance(end, std::min((unsigned)re_detail::distance(position, last), desired));
+      std::advance(end, (std::min)((unsigned)re_detail::distance(position, last), desired));
      BidiIterator origin(position);
      while((position != end) && map[(traits_uchar_type)traits_inst.translate(*position, icase)])
      {
@@ -587,8 +595,16 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set_repeat
         return false;
      if(position == last)
         return false;
-      position = ++save_pos;
+      position = save_pos;
      if(map[(traits_uchar_type)traits_inst.translate(*position, icase)])
      {
         ++position;
         ++count;
      }
      else
      {
         return false;
      }
   }while(true);
 #ifdef __BORLANDC__
 #pragma option pop
@@ -618,7 +634,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set_r
   if(::boost::is_random_access_iterator<BidiIterator>::value)
   {
      BidiIterator end = position;
-      std::advance(end, std::min((unsigned)re_detail::distance(position, last), desired));
+      std::advance(end, (std::min)((unsigned)re_detail::distance(position, last), desired));
      BidiIterator origin(position);
      while((position != end) && (position != re_is_set_member(position, last, set, re)))
      {
@@ -667,8 +683,16 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set_r
         return false;
      if(position == last)
         return false;
-      position = ++save_pos;
+      position = save_pos;
      if(position != re_is_set_member(position, last, set, re))
      {
         ++position;
         ++count;
      }
      else
      {
         return false;
      }
   }while(true);
 #ifdef __BORLANDC__
 #pragma option pop
--- a/include/boost/regex/v4/regex_compile.hpp
+++ b/include/boost/regex/v4/regex_compile.hpp
@@ -721,6 +721,13 @@ re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Alloca
   re_detail::jstack<traits_string_type, Allocator> ranges(64, data.allocator());
   re_detail::jstack<boost::uint_fast32_t, Allocator> classes(64, data.allocator());
   re_detail::jstack<traits_string_type, Allocator> equivalents(64, data.allocator());
   if(_flags & regbase::icase)
   {
      if((cls == traits_type::char_class_upper) || (cls == traits_type::char_class_lower))
      {
         cls = traits_type::char_class_alpha;
      }
   }
   classes.push(cls);
   if(dat)
   {
@@ -1066,7 +1073,7 @@ re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Alloca
      ++csingles;
      const traits_string_type& s = singles.peek();
      std::size_t len = (s.size() + 1) * sizeof(charT);
-      if(len > sizeof(charT))
+      if(len > sizeof(charT) * 2)
         singleton = false;
      std::memcpy(reinterpret_cast<charT*>(data.extend(len)), s.c_str(), len);
      singles.pop();
@@ -1350,6 +1357,7 @@ unsigned int BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::set_expr
   data.clear();
   _flags = f;
   fail(REG_NOERROR);  // clear any error
   _leading_len = 0; // set this to non-zero if there are any backrefs, we'll refer to it later...
   if(arg_first >= arg_last)
   {
@@ -1427,6 +1435,7 @@ unsigned int BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::set_expr
            {
            case traits_type::syntax_colon:
               static_cast<re_detail::re_brace*>(dat)->index = 0;
               if((_flags & nosubs) == 0)
                  --marks;
               markid.pop();
               markid.push(0);
@@ -1437,6 +1446,7 @@ unsigned int BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::set_expr
               markid.pop();
               markid.push(-1);
               common_forward_assert:
               if((_flags & nosubs) == 0)
                  --marks;
               ++ptr;
               // extend:
@@ -1462,6 +1472,7 @@ unsigned int BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::set_expr
            case traits_type::syntax_hash:
               // comment just skip it:
               static_cast<re_detail::re_brace*>(dat)->index = 0;
               if((_flags & nosubs) == 0)
                  --marks;
               markid.pop();
               mark.pop();
@@ -1600,6 +1611,7 @@ unsigned int BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::set_expr
               dat = add_simple(dat, re_detail::syntax_element_backref, sizeof(re_detail::re_brace));
               static_cast<re_detail::re_brace*>(dat)->index = i;
               ++ptr;
               _leading_len = 1;
               continue;
            }
            break;
@@ -2141,7 +2153,7 @@ unsigned int BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::fixup_le
      case re_detail::syntax_element_char_rep:
      case re_detail::syntax_element_short_set_rep: 
      case re_detail::syntax_element_long_set_rep:
-         if((len == 0) && (1 == fixup_leading_rep(dat->next.p, static_cast<re_detail::re_repeat*>(dat)->alt.p) ))
+         if((len == 0) && (_leading_len == 0) && (1 == fixup_leading_rep(dat->next.p, static_cast<re_detail::re_repeat*>(dat)->alt.p) ))
         {
            static_cast<re_detail::re_repeat*>(dat)->leading = leading_lit;
            return len;
--- a/include/boost/regex/v4/regex_grep.hpp
+++ b/include/boost/regex/v4/regex_grep.hpp
@@ -55,23 +55,23 @@ inline unsigned int regex_grep(Predicate foo,
         return count; // we've reached the end, don't try and find an extra null match.
      if(m.length() == 0)
      {
         if(m[0].second == last)
            return count;
         // we found a NULL-match, now try to find
         // a non-NULL one at the same position:
-         BidiIterator last_end(m[0].second);
+         match_results<BidiIterator, match_allocator_type> m2(m);
         if(last_end == last)
            return count;
         matcher.setf(match_not_null | match_continuous);
         if(matcher.find())
         {
            ++count;
-            last_end = m[0].second;
+            //last_end = m[0].second;
            if(0 == foo(m))
               return count;
         }
         else
         {
            // reset match back to where it was:
-            m.set_second(last_end);
+            m = m2;
         }
         matcher.unsetf((match_not_null | match_continuous) & ~flags);
      }
--- a/include/boost/regex/v4/regex_iterator.hpp
+++ b/include/boost/regex/v4/regex_iterator.hpp
@@ -76,6 +76,14 @@ template <class BidirectionalIterator,
          class traits = regex_traits<charT>,
          class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
 class regex_iterator 
 #ifndef BOOST_NO_STD_ITERATOR
   : public std::iterator<
         std::forward_iterator_tag, 
         match_results<BidirectionalIterator>,
         typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type,
         const match_results<BidirectionalIterator>*,
         const match_results<BidirectionalIterator>& >         
 #endif
 {
 private:
   typedef regex_iterator_implementation<BidirectionalIterator, charT, traits, Allocator> impl;
--- a/include/boost/regex/v4/regex_token_iterator.hpp
+++ b/include/boost/regex/v4/regex_token_iterator.hpp
@@ -23,7 +23,8 @@
 #include <boost/detail/workaround.hpp>
 #if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\
      || BOOST_WORKAROUND(BOOST_MSVC, < 1300) \
-      || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
+      || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) \
      || BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(55500))
 //
 // Borland C++ Builder 6, and Visual C++ 6,
 // can't cope with the array template constructor
@@ -51,11 +52,7 @@ template <class BidirectionalIterator,
 class regex_token_iterator_implementation 
 {
   typedef basic_regex<charT, traits, Allocator> regex_type;
 #if 1
   typedef sub_match<BidirectionalIterator>      value_type;
 #else
   typedef std::basic_string<charT>              value_type;
 #endif
   match_results<BidirectionalIterator> what;   // current match
   BidirectionalIterator                end;    // end of search area
@@ -69,10 +66,11 @@ public:
   regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, int sub, match_flag_type f)
      : end(last), pre(p), flags(f){ subs.push_back(sub); }
   regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, const std::vector<int>& v, match_flag_type f)
-      : end(last), pre(p), subs(v), flags(f){}
+      : end(last), pre(p), flags(f), subs(v){}
 #if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\
      || BOOST_WORKAROUND(BOOST_MSVC, < 1300) \
-      || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
+      || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) \
      || BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(55500))
   template <class T>
   regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, const T& submatches, match_flag_type f)
      : end(last), pre(p), flags(f)
@@ -163,6 +161,14 @@ template <class BidirectionalIterator,
          class traits = regex_traits<charT>,
          class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
 class regex_token_iterator 
 #ifndef BOOST_NO_STD_ITERATOR
   : public std::iterator<
         std::forward_iterator_tag, 
         sub_match<BidirectionalIterator>,
         typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type,
         const sub_match<BidirectionalIterator>*,
         const sub_match<BidirectionalIterator>& >         
 #endif
 {
 private:
   typedef regex_token_iterator_implementation<BidirectionalIterator, charT, traits, Allocator> impl;
@@ -193,7 +199,8 @@ public:
   }
 #if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\
      || BOOST_WORKAROUND(BOOST_MSVC, < 1300) \
-      || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
+      || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) \
      || BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(55500))
   template <class T>
   regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re,
                        const T& submatches, match_flag_type m = match_default)
--- a/include/boost/regex/v4/sub_match.hpp
+++ b/include/boost/regex/v4/sub_match.hpp
@@ -35,6 +35,8 @@ struct sub_match : public std::pair<BidiIterator, BidiIterator>
   typedef typename re_detail::regex_iterator_traits<BidiIterator>::difference_type  difference_type;
 #endif
   typedef          BidiIterator                                                     iterator_type;
   typedef          BidiIterator                                                     iterator;
   typedef          BidiIterator                                                     const_iterator;
   bool matched;
--- a/src/c_regex_traits.cpp
+++ b/src/c_regex_traits.cpp
@@ -136,7 +136,7 @@ nl_catd message_cat = (nl_catd)-1;
 unsigned int message_count = 0;
 std::string* mess_locale;
-BOOST_REGEX_DECL char* re_custom_error_messages[] = {
+char* re_custom_error_messages[] = {
   0,
   0,
   0,
@@ -182,8 +182,8 @@ std::size_t BOOST_REGEX_CALL _re_get_message(char* buf, std::size_t len, std::si
 #ifndef BOOST_NO_WREGEX
-BOOST_REGEX_DECL boost::regex_wchar_type re_zero_w;
+boost::regex_wchar_type re_zero_w;
-BOOST_REGEX_DECL boost::regex_wchar_type re_ten_w;
+boost::regex_wchar_type re_ten_w;
 unsigned int nlsw_count = 0;
 std::string* wlocale_name = 0;
--- a/src/cpp_regex_traits.cpp
+++ b/src/cpp_regex_traits.cpp
@@ -379,7 +379,7 @@ int BOOST_REGEX_CALL cpp_regex_traits<char>::toi(char c)const
 int BOOST_REGEX_CALL cpp_regex_traits<char>::toi(const char*& first, const char* last, int radix)const
 {
-   pmd->sbuf.pubsetbuf(const_cast<char*>(first), static_cast<std::streamsize>(last-first));
+   pmd->sbuf.pubsetbuf(const_cast<char*>(static_cast<const char*>(first)), static_cast<std::streamsize>(last-first));
   pmd->is.clear();
   if(std::abs(radix) == 16) pmd->is >> std::hex;
   else if(std::abs(radix) == 8) pmd->is >> std::oct;
--- a/src/cregex.cpp
+++ b/src/cregex.cpp
@@ -21,6 +21,7 @@
 #include <boost/cregex.hpp>
 #include <boost/regex.hpp>
 #include <boost/integer_traits.hpp>
 #if !defined(BOOST_NO_STD_STRING)
 #include <map>
 #include <list>
@@ -113,7 +114,7 @@ void RegExData::update()
      for(unsigned int i = 0; i < m.size(); ++i)
      {
         if(m[i].matched) strings[i] = std::string(m[i].first, m[i].second);
-         positions[i] = m[i].matched ? m[i].first - pbase : -1;
+         positions[i] = m[i].matched ? m[i].first - pbase : RegEx::npos;
      }
   }
 #ifndef BOOST_REGEX_NO_FILEITER
@@ -122,7 +123,7 @@ void RegExData::update()
      for(unsigned int i = 0; i < fm.size(); ++i)
      {
         if(fm[i].matched) strings[i] = to_string(fm[i].first, fm[i].second);
-         positions[i] = fm[i].matched ? fm[i].first - fbase : -1;
+         positions[i] = fm[i].matched ? fm[i].first - fbase : RegEx::npos;
      }
   }
 #endif
@@ -585,7 +586,13 @@ std::string RegEx::What(int i)const
   return result;
 }
-const unsigned int RegEx::npos = ~0u;
+#ifndef BOOST_NO_INCLASS_MEMBER_INITIALIZATION
 const std::size_t RegEx::npos = ::boost::integer_traits<std::size_t>::const_max;
 #elif defined(BOOST_HAS_LONG_LONG)
 const std::size_t RegEx::npos = ~0ULL;
 #else
 const std::size_t RegEx::npos = ~0UL;
 #endif
 } // namespace boost
--- a/src/w32_regex_traits.cpp
+++ b/src/w32_regex_traits.cpp
@@ -108,7 +108,7 @@ std::list<collate_name_t>* pcoll_names = 0;
 HINSTANCE hresmod = 0;
-BOOST_REGEX_DECL char* re_custom_error_messages[] = {
+char* re_custom_error_messages[] = {
   0,
   0,
   0,
@@ -147,8 +147,8 @@ enum syntax_map_size
 #ifndef BOOST_NO_WREGEX
-BOOST_REGEX_DECL boost::regex_wchar_type re_zero_w;
+boost::regex_wchar_type re_zero_w;
-BOOST_REGEX_DECL boost::regex_wchar_type re_ten_w;
+boost::regex_wchar_type re_ten_w;
 bool isPlatformNT = false;
--- a/test/regress/tests.cpp
+++ b/test/regress/tests.cpp
@@ -359,7 +359,7 @@ void cpp_tests(const basic_regex<C, T, A>& e, bool recurse = true)
               (m[-2].first - x) << "," << (m[-2].second - x) << ") expected (" <<
               matches[1] << "," << (y-x) << ")" << endl;
         }
-#if !(defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)) && !defined(BOOST_REGEX_V3)
+#if !(defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)) && !defined(BOOST_REGEX_V3) && !BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(55500))
         //
         // now try comparison operators:
         string_type s(m[0]);
@@ -593,7 +593,7 @@ hl_grep_test_proc(const RegEx& e)
   // check $`:
   start = e.Position(-1);
   end = start + e.Length(-1);
-   if(start == -1)
+   if(start == boost::RegEx::npos)
   {
      if(hl_match_id &&
         ( matches[hl_match_id] != matches[hl_match_id - 1] )
@@ -628,7 +628,7 @@ hl_grep_test_proc(const RegEx& e)
   // check $':
   start = e.Position(-2);
   end = start + e.Length(-2);
-   if(start == -1)
+   if(start == boost::RegEx::npos)
   {
      if(matches[hl_match_id + 1] != (int)search_text.size())
      {
--- a/test/regress/tests.txt
+++ b/test/regress/tests.txt
@@ -877,6 +877,10 @@ a+(b+) "...aaabb,,,ab*abbb?" $1 "...bb,,,ab*abbb?"
 - match_default normal REG_EXTENDED REG_PERL
 a** !
 a*? aa 0 0
 ^a*?$ aa 0 2
 ^.*?$ aa 0 2
 ^(?:a)*?$ aa 0 2
 ^[ab]*?$ aa 0 2
 a?? aa 0 0
 a++ !
 a+? aa 0 1
@@ -1014,6 +1018,7 @@ ab.{2,5}? ab__ 0 4
 ab.{2,5}? ab_______ 0 4
 ab.{2,5}?xy ab______xy -1 -1
 ab.{2,5}xy ab_xy -1 -1
 (.*?).somesite \n\n555.somesite 2 14 2 5
 ; now again for single character repeats:
@@ -1050,6 +1055,7 @@ ab_{2,5}? ab__ 0 4
 ab_{2,5}? ab_______ 0 4
 ab_{2,5}?xy ab______xy -1 -1
 ab_{2,5}xy ab_xy -1 -1
 (5*?).somesite //555.somesite 2 14 2 5
 ; and again for sets:
 ab[_,;]*xy abxy_ 0 4
@@ -1085,6 +1091,7 @@ ab[_,;]{2,5}? ab__ 0 4
 ab[_,;]{2,5}? ab_______ 0 4
 ab[_,;]{2,5}?xy ab______xy -1 -1
 ab[_,;]{2,5}xy ab_xy -1 -1
 (\d*?).somesite //555.somesite 2 14 2 5
 ; and again for tricky sets with digraphs:
 ab[_[.ae.]]*xy abxy_ 0 4
@@ -1120,6 +1127,7 @@ ab[_[.ae.]]{2,5}? ab__ 0 4
 ab[_[.ae.]]{2,5}? ab_______ 0 4
 ab[_[.ae.]]{2,5}?xy ab______xy -1 -1
 ab[_[.ae.]]{2,5}xy ab_xy -1 -1
 ([5[.ae.]]*?).somesite //555.somesite 2 14 2 5
 ; new bugs detected in spring 2003:
 - normal match_continuous REG_NO_POSIX_TEST
Author	SHA1	Message	Date
John Maddock	6732abe03e	HP aCC patches. [SVN r23169]	2004-06-23 12:44:17 +00:00
John Maddock	eec095b121	Fixed bug with grepping for literals. Added Sunpro workaround. [SVN r23093]	2004-06-12 10:10:07 +00:00
John Maddock	bd8de55174	64-bit portability fix [SVN r23065]	2004-06-09 12:12:42 +00:00
John Maddock	3fd3f23e6e	HP aCC workaround [SVN r23064]	2004-06-09 12:12:01 +00:00
John Maddock	cf6f69258c	64-bit portability fix [SVN r23063]	2004-06-09 11:23:52 +00:00
John Maddock	d1649417d1	Added patches for Sunpro and HP aCC [SVN r23031]	2004-06-05 11:46:05 +00:00
John Maddock	5fed1798dd	Altered initialiser order to stop gcc from complaining. [SVN r22876]	2004-05-20 10:16:09 +00:00
John Maddock	b0e83b535a	patch for nosubs flag bug [SVN r22822]	2004-05-14 10:28:09 +00:00
John Maddock	91e7e3b602	Fixed \l and \u so that they work correctly in case insensitive mode. [SVN r22804]	2004-05-12 11:39:28 +00:00
John Maddock	8d76f35c64	Patched for problem with wide character optimisations. [SVN r22724]	2004-05-03 11:31:15 +00:00
John Maddock	92bf09979a	Changed ar to $(AR). [SVN r22717]	2004-05-01 10:53:14 +00:00
John Maddock	ca9a970d6f	Don't optimise leading repeats when there are backreferences involved. [SVN r22705]	2004-04-25 10:32:09 +00:00
John Maddock	2816f0e1ca	Added introductory comment [SVN r22641]	2004-04-17 10:56:46 +00:00
John Maddock	afd2bf331a	Fixes for POSIX regexes not grepping correctly. [SVN r22623]	2004-04-09 15:55:32 +00:00
John Maddock	fb844f004e	Added fix for grepping for POSIX style matches. [SVN r22621]	2004-04-07 11:04:06 +00:00
John Maddock	283548f948	Added missing hyperlink target. [SVN r22619]	2004-04-07 10:45:53 +00:00
John Maddock	77595dddba	Added link to old docs. [SVN r22530]	2004-03-20 12:12:03 +00:00
John Maddock	edc9f4d288	Added missing preconditions [SVN r22528]	2004-03-20 11:53:18 +00:00
John Maddock	f60ed016e7	Don't try to export symbols that don't need it. [SVN r22524]	2004-03-19 12:40:39 +00:00
John Maddock	5503fa8fb7	Fixed typo. [SVN r22523]	2004-03-19 12:39:56 +00:00
John Maddock	5cce92fa23	Added typedefs to the index. [SVN r22522]	2004-03-19 12:39:30 +00:00
John Maddock	b35a6eabbd	Added missing typedefs. [SVN r22521]	2004-03-19 12:38:44 +00:00
John Maddock	62e79baf65	Fixed typo. [SVN r22437]	2004-03-05 11:31:43 +00:00
John Maddock	f7abd42972	Added extra non-greedy repeat tests [SVN r22421]	2004-03-02 16:57:36 +00:00
John Maddock	82abe57838	removed unnessary #if [SVN r22420]	2004-03-02 16:56:56 +00:00
John Maddock	5babdbfa82	Fixed nasty non-greedy repeat bug [SVN r22419]	2004-03-02 16:56:28 +00:00
John Maddock	f8cd505f18	Updated iterator defs [SVN r22388]	2004-02-25 12:37:52 +00:00
John Maddock	3b3becb57c	Added extra acknowledgements [SVN r22384]	2004-02-25 12:34:42 +00:00
John Maddock	d717e0a962	Fixed typos reported in release candidate. [SVN r22161]	2004-02-04 15:24:31 +00:00
John Maddock	8a2e6a5dfb	Added more tests to catch some additional regressions. [SVN r21526]	2004-01-07 12:02:58 +00:00
John Maddock	b984803077	Added last minute patch for .*?$ failing in the non-recursive algorithm. [SVN r21525]	2004-01-07 12:00:51 +00:00
nobody	a952ab8c15	This commit was manufactured by cvs2svn to create branch 'RC_1_31_0'. [SVN r21427]	2003-12-30 12:10:04 +00:00