From 829f4fd8ab6804a7cbd1fa5d393498f855f3fc97 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Tue, 26 Apr 2011 08:12:27 +0000 Subject: [PATCH 1/9] Suppress msvc warning. Fixes #5504. [SVN r71496] --- include/boost/regex/pending/unicode_iterator.hpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/boost/regex/pending/unicode_iterator.hpp b/include/boost/regex/pending/unicode_iterator.hpp index 657ca0a4..a8faefd5 100644 --- a/include/boost/regex/pending/unicode_iterator.hpp +++ b/include/boost/regex/pending/unicode_iterator.hpp @@ -113,6 +113,10 @@ inline unsigned utf8_trailing_byte_count(boost::uint8_t c) return utf8_byte_count(c) - 1; } +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable:4100) +#endif inline void invalid_utf32_code_point(::boost::uint32_t val) { #ifndef BOOST_NO_STD_LOCALE @@ -124,6 +128,9 @@ inline void invalid_utf32_code_point(::boost::uint32_t val) #endif boost::throw_exception(e); } +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif } // namespace detail From c918ac94ef5d6caa984b8fe36e9501f7253741aa Mon Sep 17 00:00:00 2001 From: John Maddock Date: Tue, 26 Apr 2011 09:16:02 +0000 Subject: [PATCH 2/9] Update history and regenerate docs. [SVN r71498] --- doc/history.qbk | 4 +- .../background_information/examples.html | 6 +- .../background_information/history.html | 27 +++--- .../background_information/locale.html | 8 +- .../background_information/standards.html | 10 +- doc/html/boost_regex/captures.html | 6 +- .../format/boost_format_syntax.html | 8 +- doc/html/boost_regex/install.html | 16 ++-- doc/html/boost_regex/ref/bad_expression.html | 4 +- doc/html/boost_regex/ref/basic_regex.html | 18 ++-- .../ref/concepts/traits_concept.html | 4 +- .../deprecated_interfaces/regex_format.html | 2 +- doc/html/boost_regex/ref/error_type.html | 4 +- doc/html/boost_regex/ref/match_flag_type.html | 2 +- doc/html/boost_regex/ref/match_results.html | 4 +- .../ref/non_std_strings/icu/unicode_algo.html | 6 +- .../ref/non_std_strings/icu/unicode_iter.html | 4 +- .../non_std_strings/mfc_strings/mfc_algo.html | 10 +- .../non_std_strings/mfc_strings/mfc_iter.html | 4 +- doc/html/boost_regex/ref/posix.html | 8 +- doc/html/boost_regex/ref/regex_iterator.html | 4 +- doc/html/boost_regex/ref/regex_match.html | 4 +- doc/html/boost_regex/ref/regex_replace.html | 4 +- doc/html/boost_regex/ref/regex_search.html | 4 +- .../boost_regex/ref/regex_token_iterator.html | 4 +- doc/html/boost_regex/ref/regex_traits.html | 2 +- doc/html/boost_regex/ref/sub_match.html | 8 +- .../boost_regex/syntax/basic_extended.html | 66 ++++++------- doc/html/boost_regex/syntax/basic_syntax.html | 44 ++++----- doc/html/boost_regex/syntax/perl_syntax.html | 96 +++++++++---------- doc/html/boost_regex/unicode.html | 4 +- doc/html/index.html | 4 +- 32 files changed, 203 insertions(+), 196 deletions(-) diff --git a/doc/history.qbk b/doc/history.qbk index 1af9e2ca..ddcb92bb 100644 --- a/doc/history.qbk +++ b/doc/history.qbk @@ -18,7 +18,9 @@ All issues including closed ones can be viewed [@https://svn.boost.org/trac/boos [h4 Boost 1.47] Fixed issues: -[@https://svn.boost.org/trac/boost/ticket/5223 #5223]. +[@https://svn.boost.org/trac/boost/ticket/5223 #5223], [@https://svn.boost.org/trac/boost/ticket/5353 #5353], +[@https://svn.boost.org/trac/boost/ticket/5363 #5363], [@https://svn.boost.org/trac/boost/ticket/5462 #5462], +[@https://svn.boost.org/trac/boost/ticket/5472 #5472], [@https://svn.boost.org/trac/boost/ticket/5504 #5504]. [h4 Boost 1.44] diff --git a/doc/html/boost_regex/background_information/examples.html b/doc/html/boost_regex/background_information/examples.html index 47fd2ecc..72d49743 100644 --- a/doc/html/boost_regex/background_information/examples.html +++ b/doc/html/boost_regex/background_information/examples.html @@ -28,7 +28,7 @@ Example Programs
- + Test Programs
@@ -151,7 +151,7 @@ Files: captures_test.cpp.

- + Example programs
@@ -177,7 +177,7 @@ Files: regex_timer.cpp.

- + Code snippets
diff --git a/doc/html/boost_regex/background_information/history.html b/doc/html/boost_regex/background_information/history.html index bde59b6d..96f0d112 100644 --- a/doc/html/boost_regex/background_information/history.html +++ b/doc/html/boost_regex/background_information/history.html @@ -36,15 +36,20 @@ All issues including closed ones can be viewed here.

- + Boost 1.47

- Fixed issues: #5223. + Fixed issues: #5223, + #5353, + #5363, + #5462, + #5472, + #5504.

- + Boost 1.44
@@ -63,7 +68,7 @@ #3890

- + Boost 1.42
@@ -92,7 +97,7 @@
- + Boost 1.40
@@ -101,7 +106,7 @@ branch resets and recursive regular expressions.
- + Boost 1.38
@@ -129,7 +134,7 @@
- + Boost 1.34
@@ -152,7 +157,7 @@
- + Boost 1.33.1
@@ -222,7 +227,7 @@
- + Boost 1.33.0
@@ -277,7 +282,7 @@
- + Boost 1.32.1
@@ -285,7 +290,7 @@ Fixed bug in partial matches of bounded repeats of '.'.
- + Boost 1.31.0
diff --git a/doc/html/boost_regex/background_information/locale.html b/doc/html/boost_regex/background_information/locale.html index 33880c20..41398f91 100644 --- a/doc/html/boost_regex/background_information/locale.html +++ b/doc/html/boost_regex/background_information/locale.html @@ -58,7 +58,7 @@ There are three separate localization mechanisms supported by Boost.Regex:

- + Win32 localization model.
@@ -90,7 +90,7 @@ are treated as "unknown" graphic characters.

- + C localization model.
@@ -114,7 +114,7 @@ libraries including version 1 of this library.

- + C++ localization model.
@@ -151,7 +151,7 @@ in your code. The best way to ensure this is to add the #define to <boost/regex/user.hpp>.

- + Providing a message catalogue
diff --git a/doc/html/boost_regex/background_information/standards.html b/doc/html/boost_regex/background_information/standards.html index 68fd4cd4..d7d41ebe 100644 --- a/doc/html/boost_regex/background_information/standards.html +++ b/doc/html/boost_regex/background_information/standards.html @@ -28,7 +28,7 @@ Conformance
- + C++

@@ -36,7 +36,7 @@ Report on C++ Library Extensions.

- + ECMAScript / JavaScript
@@ -49,7 +49,7 @@ rather than a Unicode escape sequence; use \x{DDDD} for Unicode escape sequences.

- + Perl

@@ -73,7 +73,7 @@ the Unicode requirements below.

- + POSIX

@@ -93,7 +93,7 @@ a custom traits class.

- + Unicode

diff --git a/doc/html/boost_regex/captures.html b/doc/html/boost_regex/captures.html index 4eb41562..62fb0c3d 100644 --- a/doc/html/boost_regex/captures.html +++ b/doc/html/boost_regex/captures.html @@ -35,7 +35,7 @@ accessed.

- + Marked sub-expressions

@@ -218,7 +218,7 @@ output stream.

- + Unmatched Sub-Expressions

@@ -231,7 +231,7 @@ you can determine which sub-expressions matched by accessing the sub_match::matched data member.

- + Repeated Captures

diff --git a/doc/html/boost_regex/format/boost_format_syntax.html b/doc/html/boost_regex/format/boost_format_syntax.html index 5e0f6fec..8efd8856 100644 --- a/doc/html/boost_regex/format/boost_format_syntax.html +++ b/doc/html/boost_regex/format/boost_format_syntax.html @@ -32,7 +32,7 @@ '$', '\', '(', ')', '?', and ':'.

- + Grouping

@@ -40,7 +40,7 @@ you want a to output literal parenthesis.

- + Conditionals

@@ -79,7 +79,7 @@ ?{NAME}true-expression:false-expression

- + Placeholder Sequences
@@ -319,7 +319,7 @@ as a literal.

- + Escape Sequences
diff --git a/doc/html/boost_regex/install.html b/doc/html/boost_regex/install.html index ce667b30..3873e248 100644 --- a/doc/html/boost_regex/install.html +++ b/doc/html/boost_regex/install.html @@ -49,7 +49,7 @@ file before you can use it, instructions for specific platforms are as follows:

- + Building with bjam

@@ -58,7 +58,7 @@ started guide for more information.

- + Building With Unicode and ICU Support
@@ -158,11 +158,11 @@ header-include and linker-search paths).

- + Building via makefiles
- + Borland C++ Builder:
- + GCC(2.95 and later)

@@ -364,7 +364,7 @@ see the config library documentation.

- + Sun Workshop 6.1

@@ -409,7 +409,7 @@ will build v9 variants of the regex library named libboost_regex_v9.a etc.

- + Makefiles for Other compilers
diff --git a/doc/html/boost_regex/ref/bad_expression.html b/doc/html/boost_regex/ref/bad_expression.html index 2d11bb19..b0a392ae 100644 --- a/doc/html/boost_regex/ref/bad_expression.html +++ b/doc/html/boost_regex/ref/bad_expression.html @@ -27,7 +27,7 @@ bad_expression
- + Synopsis 
#include <boost/pattern_except.hpp>
@@ -54,7 +54,7 @@
 } // namespace boost
- + Description 
regex_error(const std::string& s, regex_constants::error_type err, std::ptrdiff_t pos);
diff --git a/doc/html/boost_regex/ref/basic_regex.html b/doc/html/boost_regex/ref/basic_regex.html
index 9927497c..44865b37 100644
--- a/doc/html/boost_regex/ref/basic_regex.html
+++ b/doc/html/boost_regex/ref/basic_regex.html
@@ -27,7 +27,7 @@
 basic_regex
 
 

-
+
         Synopsis
       

 
#include <boost/regex.hpp>
@@ -244,7 +244,7 @@
 } // namespace boost
 

 

-
+
         Description
       

 

@@ -325,7 +325,7 @@
         basic_regex.
       

 

-
Table 1. basic_regex default construction postconditions

+
Table 1. basic_regex default construction postconditions

 
@@ -403,7 +403,7 @@
         flags specified in f.
       

-
Table 2. Postconditions for basic_regex construction

+
Table 2. Postconditions for basic_regex construction

 

 
 

 
@@ -506,7 +506,7 @@
         specified in f.
       

-
Table 3. Postconditions for basic_regex construction

+
Table 3. Postconditions for basic_regex construction

 

 
 

 
@@ -608,7 +608,7 @@
         according the option flags specified in f.
       

-
Table 4. Postconditions for basic_regex construction

+
Table 4. Postconditions for basic_regex construction

 

 
 

 
@@ -716,7 +716,7 @@
         flags specified in f.
       

-
Table 5. Postconditions for basic_regex construction

+
Table 5. Postconditions for basic_regex construction

 

 
 

 
@@ -816,7 +816,7 @@
         flags specified in f.
       

-
Table 6. Postconditions for basic_regex construction

+
Table 6. Postconditions for basic_regex construction

 

 
 

 
@@ -1002,7 +1002,7 @@
         in f.
       

-
Table 7. Postconditions for basic_regex::assign

+
Table 7. Postconditions for basic_regex::assign

 

 
 

 
diff --git a/doc/html/boost_regex/ref/concepts/traits_concept.html b/doc/html/boost_regex/ref/concepts/traits_concept.html
index be80bbd4..becee9ce 100644
--- a/doc/html/boost_regex/ref/concepts/traits_concept.html
+++ b/doc/html/boost_regex/ref/concepts/traits_concept.html
@@ -34,7 +34,7 @@
           Boost-specific enhanced interface.
         

-
+
           Minimal
           requirements.
         

@@ -378,7 +378,7 @@
 

 
 

 
 

 

-
+
           Additional
           Optional Requirements
         

diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html b/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
index 90df092e..201ae3e8 100644
--- a/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
@@ -34,7 +34,7 @@
           previous version of Boost.Regex and will not be further updated:
         

 

-
+
           Algorithm
           regex_format
         

diff --git a/doc/html/boost_regex/ref/error_type.html b/doc/html/boost_regex/ref/error_type.html
index a8cd039a..7fcb99e2 100644
--- a/doc/html/boost_regex/ref/error_type.html
+++ b/doc/html/boost_regex/ref/error_type.html
@@ -27,7 +27,7 @@
 error_type
 

 

-
+
         Synopsis
       

 

@@ -57,7 +57,7 @@
 } // namespace boost
- + Description

diff --git a/doc/html/boost_regex/ref/match_flag_type.html b/doc/html/boost_regex/ref/match_flag_type.html index e76b864f..33d55ce6 100644 --- a/doc/html/boost_regex/ref/match_flag_type.html +++ b/doc/html/boost_regex/ref/match_flag_type.html @@ -69,7 +69,7 @@ } // namespace boost

- + Description

diff --git a/doc/html/boost_regex/ref/match_results.html b/doc/html/boost_regex/ref/match_results.html index 3cc8f202..7a587305 100644 --- a/doc/html/boost_regex/ref/match_results.html +++ b/doc/html/boost_regex/ref/match_results.html @@ -27,7 +27,7 @@ match_results

- + Synopsis 
#include <boost/regex.hpp>
@@ -167,7 +167,7 @@
          match_results<BidirectionalIterator, Allocator>& m2);
- + Description

diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html index 48867621..812cb80d 100644 --- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html +++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html @@ -43,7 +43,7 @@ on to the "real" algorithm.

- + u32regex_match

@@ -89,7 +89,7 @@ }

- + u32regex_search

@@ -128,7 +128,7 @@ }

- + u32regex_replace

diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html index 07ca66e2..030ef13b 100644 --- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html +++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html @@ -28,7 +28,7 @@ Aware Regex Iterators

- + u32regex_iterator

@@ -126,7 +126,7 @@ Provided of course that the input is encoded as UTF-8.

- + u32regex_token_iterator

diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html index fced7a46..7b9d97ea 100644 --- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html +++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html @@ -34,7 +34,7 @@ here they are anyway:

- + regex_match

@@ -82,7 +82,7 @@ }

- + regex_match (second overload)
@@ -110,7 +110,7 @@ }
- + regex_search

@@ -149,7 +149,7 @@ }

- + regex_search (second overload)
@@ -164,7 +164,7 @@ + s.GetLength(), e, f);

- + regex_replace

diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html index 76ac2b79..ceee130c 100644 --- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html +++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html @@ -32,7 +32,7 @@ an MFC/ATL string to a regex_iterator or regex_token_iterator:

- + regex_iterator creation helper
@@ -68,7 +68,7 @@ }
- + regex_token_iterator creation helpers
diff --git a/doc/html/boost_regex/ref/posix.html b/doc/html/boost_regex/ref/posix.html index 93e70c4f..b3b98863 100644 --- a/doc/html/boost_regex/ref/posix.html +++ b/doc/html/boost_regex/ref/posix.html @@ -163,7 +163,7 @@

- + regcomp

@@ -375,7 +375,7 @@

- + regerror

@@ -461,7 +461,7 @@ buffer.

- + regexec

@@ -529,7 +529,7 @@

- + regfree

diff --git a/doc/html/boost_regex/ref/regex_iterator.html b/doc/html/boost_regex/ref/regex_iterator.html index 5cc52f18..352216e2 100644 --- a/doc/html/boost_regex/ref/regex_iterator.html +++ b/doc/html/boost_regex/ref/regex_iterator.html @@ -78,7 +78,7 @@ regex_constants::match_flag_type m = regex_constants::match_default);

- + Description

@@ -415,7 +415,7 @@ m.

- + Examples

diff --git a/doc/html/boost_regex/ref/regex_match.html b/doc/html/boost_regex/ref/regex_match.html index 2cb52851..45b385f3 100644 --- a/doc/html/boost_regex/ref/regex_match.html +++ b/doc/html/boost_regex/ref/regex_match.html @@ -80,7 +80,7 @@ match_flag_type flags = match_default);

- + Description 
template <class BidirectionalIterator, class Allocator, class charT, class traits>
@@ -361,7 +361,7 @@
         Effects: Returns the result of regex_match(s.begin(), s.end(), e, flags).
       

 

-
+
         Examples
       

 

diff --git a/doc/html/boost_regex/ref/regex_replace.html b/doc/html/boost_regex/ref/regex_replace.html
index 2dfae921..f74d8abc 100644
--- a/doc/html/boost_regex/ref/regex_replace.html
+++ b/doc/html/boost_regex/ref/regex_replace.html
@@ -53,7 +53,7 @@
                                   match_flag_type flags = match_default);
- + Description 
template <class OutputIterator, class BidirectionalIterator, class traits, class Formatter>
@@ -199,7 +199,7 @@
         and then returns result.
       

 

-
+
         Examples
       

 

diff --git a/doc/html/boost_regex/ref/regex_search.html b/doc/html/boost_regex/ref/regex_search.html
index 7353a683..58e33f4f 100644
--- a/doc/html/boost_regex/ref/regex_search.html
+++ b/doc/html/boost_regex/ref/regex_search.html
@@ -73,7 +73,7 @@
                   match_flag_type flags = match_default);
- + Description 
template <class BidirectionalIterator, class Allocator, class charT, class traits>
@@ -357,7 +357,7 @@
         Effects: Returns the result of regex_search(s.begin(), s.end(), e, flags).
       

 

-
+
         Examples
       

 

diff --git a/doc/html/boost_regex/ref/regex_token_iterator.html b/doc/html/boost_regex/ref/regex_token_iterator.html
index 459f2615..d3c6d957 100644
--- a/doc/html/boost_regex/ref/regex_token_iterator.html
+++ b/doc/html/boost_regex/ref/regex_token_iterator.html
@@ -136,7 +136,7 @@
          regex_constants::match_flag_type m = regex_constants::match_default);
- + Description 
regex_token_iterator();
@@ -357,7 +357,7 @@
         m.
       

 

-
+
         Examples
       

 

diff --git a/doc/html/boost_regex/ref/regex_traits.html b/doc/html/boost_regex/ref/regex_traits.html
index 22fcad80..86aa32c4 100644
--- a/doc/html/boost_regex/ref/regex_traits.html
+++ b/doc/html/boost_regex/ref/regex_traits.html
@@ -46,7 +46,7 @@
 } // namespace boost
- + Description

diff --git a/doc/html/boost_regex/ref/sub_match.html b/doc/html/boost_regex/ref/sub_match.html index ac4c19ba..50f544a8 100644 --- a/doc/html/boost_regex/ref/sub_match.html +++ b/doc/html/boost_regex/ref/sub_match.html @@ -329,11 +329,11 @@ } // namespace boost

- + Description
- + Members 
typedef typename std::iterator_traits<iterator>::value_type value_type;
@@ -446,7 +446,7 @@
           
 
 

-
+
         sub_match
         non-member operators
       

@@ -883,7 +883,7 @@
         + m2.str().
       

 

-
+
         Stream inserter
       

 
template <class charT, class traits, class BidirectionalIterator>
diff --git a/doc/html/boost_regex/syntax/basic_extended.html b/doc/html/boost_regex/syntax/basic_extended.html
index 538fb781..fa466b74 100644
--- a/doc/html/boost_regex/syntax/basic_extended.html
+++ b/doc/html/boost_regex/syntax/basic_extended.html
@@ -28,7 +28,7 @@
       Expression Syntax
 
 

-
+
         Synopsis
       

 

@@ -44,7 +44,7 @@
 boost::regex e2(my_expression, boost::regex::extended|boost::regex::icase);
 

 

-
+
         POSIX
         Extended Syntax
       

@@ -54,7 +54,7 @@
       

 
.[{}()\*+?|^$

 

-
+
         Wildcard:
       

 

@@ -72,7 +72,7 @@
           
 
 

-
+
         Anchors:
       

 

@@ -84,7 +84,7 @@
         of an expression, or the last character of a sub-expression.
       

 

-
+
         Marked
         sub-expressions:
       

@@ -96,7 +96,7 @@
         to by a back-reference.
       

 

-
+
         Repeats:
       

 

@@ -182,7 +182,7 @@ cab
         operator to be applied to.
       

 

-
+
         Back references:
       

 

@@ -212,7 +212,7 @@ cab
         

 
 

-
+
         Alternation
       

 

@@ -225,7 +225,7 @@ cab
         will match either of "abd" or "abef".
       

 

-
+
         Character
         sets:
       

@@ -238,7 +238,7 @@ cab
         A bracket expression may contain any combination of the following:
       

 

-
+
         Single
         characters:
       

@@ -247,7 +247,7 @@ cab
         or 'c'.
       

 

-
+
         Character
         ranges:
       

@@ -263,7 +263,7 @@ cab
         the code points of the characters only.
       

 

-
+
         Negation:
       

 

@@ -272,7 +272,7 @@ cab
         range a-c.
       

 

-
+
         Character
         classes:
       

@@ -282,7 +282,7 @@ cab
         character class names.
       

 

-
+
         Collating
         Elements:
       

@@ -310,7 +310,7 @@ cab
         matches a NUL character.
       

 

-
+
         Equivalence
         classes:
       

@@ -327,7 +327,7 @@ cab
         or even all locales on one platform.
       

 

-
+
         Combinations:
       

 

@@ -335,7 +335,7 @@ cab
         [[:digit:]a-c[.NUL.]].
       

 

-
+
         Escapes
       

 

@@ -361,7 +361,7 @@ cab
         extensions are also supported by Boost.Regex:
       

 

-
+
         Escapes
         matching a specific character
       

@@ -550,7 +550,7 @@ cab
 
 
 

-
+
         "Single
         character" character classes:
       

@@ -704,7 +704,7 @@ cab
 
 
 

-
+
         Character
         Properties
       

@@ -811,7 +811,7 @@ cab
         matches any "digit" character, as does \p{digit}.
       

 

-
+
         Word Boundaries
       

 

@@ -886,7 +886,7 @@ cab
 
 
 

-
+
         Buffer
         boundaries
       

@@ -977,7 +977,7 @@ cab
 
 
 

-
+
         Continuation
         Escape
       

@@ -989,7 +989,7 @@ cab
         match to start where the last one ended.
       

 

-
+
         Quoting
         escape
       

@@ -1003,7 +1003,7 @@ cab
 \*+aaa
- + Unicode escapes
@@ -1054,7 +1054,7 @@ cab
- + Any other escape
@@ -1063,7 +1063,7 @@ cab \@ matches a literal '@'.

- + Operator precedence
@@ -1100,7 +1100,7 @@ cab
- + What Gets Matched
@@ -1110,11 +1110,11 @@ cab rule.

- + Variations

- + Egrep

@@ -1135,7 +1135,7 @@ cab used with the -E option.

- + awk

@@ -1149,7 +1149,7 @@ cab these by default anyway.

- + Options

@@ -1162,7 +1162,7 @@ cab modify how the case and locale sensitivity are to be applied.

- + References

diff --git a/doc/html/boost_regex/syntax/basic_syntax.html b/doc/html/boost_regex/syntax/basic_syntax.html index 05b11625..94ad1851 100644 --- a/doc/html/boost_regex/syntax/basic_syntax.html +++ b/doc/html/boost_regex/syntax/basic_syntax.html @@ -28,7 +28,7 @@ Expression Syntax

- + Synopsis

@@ -43,7 +43,7 @@ boost::regex e2(my_expression, boost::regex::basic|boost::regex::icase);

- + POSIX Basic Syntax

@@ -53,7 +53,7 @@ 

.[\*^$
- + Wildcard:

@@ -71,7 +71,7 @@

- + Anchors:

@@ -83,7 +83,7 @@ of an expression, or the last character of a sub-expression.

- + Marked sub-expressions:
@@ -95,7 +95,7 @@ by a back-reference.

- + Repeats:

@@ -153,7 +153,7 @@ aaaa to.

- + Back references:

@@ -171,7 +171,7 @@ aaaa 

aaabba
- + Character sets:
@@ -184,7 +184,7 @@ aaaa A bracket expression may contain any combination of the following:

- + Single characters:
@@ -193,7 +193,7 @@ aaaa or 'c'.

- + Character ranges:
@@ -209,7 +209,7 @@ aaaa of the characters only.

- + Negation:

@@ -218,7 +218,7 @@ aaaa range a-c.

- + Character classes:
@@ -228,7 +228,7 @@ aaaa character class names.

- + Collating Elements:
@@ -257,7 +257,7 @@ aaaa element names.

- + Equivalence classes:
@@ -274,7 +274,7 @@ aaaa or even all locales on one platform.

- + Combinations:

@@ -282,7 +282,7 @@ aaaa [[:digit:]a-c[.NUL.]].

- + Escapes

@@ -297,7 +297,7 @@ aaaa will match either a literal '\' or a '^'.

- + What Gets Matched

@@ -307,11 +307,11 @@ aaaa rule.

- + Variations

- + Grep

@@ -329,7 +329,7 @@ aaaa As its name suggests, this behavior is consistent with the Unix utility grep.

- + emacs

@@ -609,7 +609,7 @@ aaaa leftmost-longest rule.

- + Options

@@ -623,7 +623,7 @@ aaaa options modify how the case and locale sensitivity are to be applied.

- + References

diff --git a/doc/html/boost_regex/syntax/perl_syntax.html b/doc/html/boost_regex/syntax/perl_syntax.html index 560fd763..00e2b7e7 100644 --- a/doc/html/boost_regex/syntax/perl_syntax.html +++ b/doc/html/boost_regex/syntax/perl_syntax.html @@ -28,7 +28,7 @@ Syntax

- + Synopsis

@@ -43,7 +43,7 @@ boost::regex e2(my_expression, boost::regex::perl|boost::regex::icase);

- + Perl Regular Expression Syntax

@@ -53,7 +53,7 @@ 

.[{}()\*+?|^$
- + Wildcard

@@ -73,7 +73,7 @@

- + Anchors

@@ -83,7 +83,7 @@ A '$' character shall match the end of a line.

- + Marked sub-expressions
@@ -94,7 +94,7 @@ can also repeated, or referred to by a back-reference.

- + Non-marking grouping
@@ -107,7 +107,7 @@ without splitting out any separate sub-expressions.

- + Repeats

@@ -188,7 +188,7 @@ to be applied to.

- + Non greedy repeats
@@ -218,7 +218,7 @@ while consuming as little input as possible.

- + Possessive repeats
@@ -250,7 +250,7 @@ while giving nothing back.

- + Back references

@@ -360,7 +360,7 @@ named "two".

- + Alternation

@@ -387,7 +387,7 @@ (?:abc)?? has exactly the same effect.

- + Character sets

@@ -399,7 +399,7 @@ A bracket expression may contain any combination of the following:

- + Single characters

@@ -407,7 +407,7 @@ 'b', or 'c'.

- + Character ranges
@@ -421,7 +421,7 @@ sensitive.

- + Negation

@@ -430,7 +430,7 @@ matches any character that is not in the range a-c.

- + Character classes
@@ -441,7 +441,7 @@ class names.

- + Collating Elements
@@ -463,7 +463,7 @@ matches a \0 character.

- + Equivalence classes
@@ -480,7 +480,7 @@ or even all locales on one platform.

- + Escaped Characters
@@ -492,7 +492,7 @@ is not a "word" character.

- + Combinations

@@ -500,7 +500,7 @@ [[:digit:]a-c[.NUL.]].

- + Escapes

@@ -692,7 +692,7 @@

- + "Single character" character classes:
@@ -894,7 +894,7 @@
- + Character Properties
@@ -1002,7 +1002,7 @@ as does \p{digit}.

- + Word Boundaries

@@ -1021,7 +1021,7 @@ \B Matches only when not at a word boundary.

- + Buffer boundaries

@@ -1048,7 +1048,7 @@ (?=\n?\z).

- + Continuation Escape
@@ -1060,7 +1060,7 @@ one ended.

- + Quoting escape

@@ -1073,7 +1073,7 @@ \*+aaa

- + Unicode escapes

@@ -1083,7 +1083,7 @@ followed by a sequence of zero or more combining characters.

- + Matching Line Endings
@@ -1092,7 +1092,7 @@ sequence, specifically it is identical to the expression (?>\x0D\x0A?|[\x0A-\x0C\x85\x{2028}\x{2029}]).

- + Keeping back some text
@@ -1107,7 +1107,7 @@ This can be used to simulate variable width lookbehind assertions.

- + Any other escape
@@ -1116,7 +1116,7 @@ \@ matches a literal '@'.

- + Perl Extended Patterns
@@ -1125,7 +1125,7 @@ (?.

- + Named Subexpressions
@@ -1147,14 +1147,14 @@ format string for search and replace operations, or in the match_results member functions.

- + Comments

(?# ... ) is treated as a comment, it's contents are ignored.

- + Modifiers

@@ -1168,7 +1168,7 @@ pattern only.

- + Non-marking groups
@@ -1177,7 +1177,7 @@ an additional sub-expression.

- + Branch reset

@@ -1199,7 +1199,7 @@ # 1 2 2 3 2 3 4

- + Lookahead

@@ -1222,7 +1222,7 @@ could be used to validate the password.

- + Lookbehind

@@ -1236,7 +1236,7 @@ (pattern must be of fixed length).

- + Independent sub-expressions
@@ -1249,7 +1249,7 @@ no match is found at all.

- + Recursive Expressions
@@ -1273,7 +1273,7 @@ to the next sub-expression to be declared.

- + Conditional Expressions
@@ -1323,7 +1323,7 @@
- + Operator precedence
@@ -1358,7 +1358,7 @@

- + What gets matched

@@ -1534,7 +1534,7 @@

- + Variations

@@ -1543,7 +1543,7 @@ and JScript are all synonyms for perl.

- + Options

@@ -1555,7 +1555,7 @@ are to be applied.

- + Pattern Modifiers

@@ -1567,7 +1567,7 @@ and no_mod_s.

- + References

diff --git a/doc/html/boost_regex/unicode.html b/doc/html/boost_regex/unicode.html index f88297e8..12729aee 100644 --- a/doc/html/boost_regex/unicode.html +++ b/doc/html/boost_regex/unicode.html @@ -30,7 +30,7 @@ There are two ways to use Boost.Regex with Unicode strings:

- + Rely on wchar_t

@@ -56,7 +56,7 @@

- + Use a Unicode Aware Regular Expression Type.
diff --git a/doc/html/index.html b/doc/html/index.html index 870c10a9..91866311 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -28,7 +28,7 @@

Copyright © 1998 -2010 John Maddock

-

+

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

@@ -195,7 +195,7 @@

- +

Last revised: March 18, 2011 at 16:45:40 GMT

Last revised: April 26, 2011 at 08:43:03 GMT
From cb142a44b61ffb93498291f80f7ab6db572078ad Mon Sep 17 00:00:00 2001 From: John Maddock Date: Mon, 16 May 2011 17:09:47 +0000 Subject: [PATCH 3/9] Add missing docs for (?&NAME) Perlre construct. regenerate docs. [SVN r71986] --- .../background_information/examples.html | 6 +- .../background_information/history.html | 20 ++-- .../background_information/locale.html | 8 +- .../background_information/standards.html | 10 +- doc/html/boost_regex/captures.html | 6 +- .../format/boost_format_syntax.html | 8 +- doc/html/boost_regex/install.html | 16 +-- doc/html/boost_regex/ref/bad_expression.html | 4 +- doc/html/boost_regex/ref/basic_regex.html | 18 ++-- .../ref/concepts/traits_concept.html | 4 +- .../deprecated_interfaces/regex_format.html | 2 +- doc/html/boost_regex/ref/error_type.html | 4 +- doc/html/boost_regex/ref/match_flag_type.html | 2 +- doc/html/boost_regex/ref/match_results.html | 4 +- .../ref/non_std_strings/icu/unicode_algo.html | 6 +- .../ref/non_std_strings/icu/unicode_iter.html | 4 +- .../non_std_strings/mfc_strings/mfc_algo.html | 10 +- .../non_std_strings/mfc_strings/mfc_iter.html | 4 +- doc/html/boost_regex/ref/posix.html | 8 +- doc/html/boost_regex/ref/regex_iterator.html | 4 +- doc/html/boost_regex/ref/regex_match.html | 4 +- doc/html/boost_regex/ref/regex_replace.html | 4 +- doc/html/boost_regex/ref/regex_search.html | 4 +- .../boost_regex/ref/regex_token_iterator.html | 4 +- doc/html/boost_regex/ref/regex_traits.html | 2 +- doc/html/boost_regex/ref/sub_match.html | 8 +- .../boost_regex/syntax/basic_extended.html | 66 ++++++------ doc/html/boost_regex/syntax/basic_syntax.html | 44 ++++---- doc/html/boost_regex/syntax/perl_syntax.html | 101 +++++++++--------- doc/html/boost_regex/unicode.html | 4 +- doc/html/index.html | 4 +- doc/syntax_perl.qbk | 4 +- 32 files changed, 201 insertions(+), 196 deletions(-) diff --git a/doc/html/boost_regex/background_information/examples.html b/doc/html/boost_regex/background_information/examples.html index 72d49743..af965f48 100644 --- a/doc/html/boost_regex/background_information/examples.html +++ b/doc/html/boost_regex/background_information/examples.html @@ -28,7 +28,7 @@ Example Programs
- + Test Programs
@@ -151,7 +151,7 @@ Files: captures_test.cpp.

- + Example programs
@@ -177,7 +177,7 @@ Files: regex_timer.cpp.

- + Code snippets
diff --git a/doc/html/boost_regex/background_information/history.html b/doc/html/boost_regex/background_information/history.html index 96f0d112..e819d0c0 100644 --- a/doc/html/boost_regex/background_information/history.html +++ b/doc/html/boost_regex/background_information/history.html @@ -36,7 +36,7 @@ All issues including closed ones can be viewed here.

- + Boost 1.47
@@ -49,7 +49,7 @@ #5504.

- + Boost 1.44
@@ -68,7 +68,7 @@ #3890

- + Boost 1.42
@@ -97,7 +97,7 @@
- + Boost 1.40
@@ -106,7 +106,7 @@ branch resets and recursive regular expressions.
- + Boost 1.38
@@ -134,7 +134,7 @@
- + Boost 1.34
@@ -157,7 +157,7 @@
- + Boost 1.33.1
@@ -227,7 +227,7 @@
- + Boost 1.33.0
@@ -282,7 +282,7 @@
- + Boost 1.32.1
@@ -290,7 +290,7 @@ Fixed bug in partial matches of bounded repeats of '.'.
- + Boost 1.31.0
diff --git a/doc/html/boost_regex/background_information/locale.html b/doc/html/boost_regex/background_information/locale.html index 41398f91..014b73f8 100644 --- a/doc/html/boost_regex/background_information/locale.html +++ b/doc/html/boost_regex/background_information/locale.html @@ -58,7 +58,7 @@ There are three separate localization mechanisms supported by Boost.Regex:

- + Win32 localization model.
@@ -90,7 +90,7 @@ are treated as "unknown" graphic characters.

- + C localization model.
@@ -114,7 +114,7 @@ libraries including version 1 of this library.

- + C++ localization model.
@@ -151,7 +151,7 @@ in your code. The best way to ensure this is to add the #define to <boost/regex/user.hpp>.

- + Providing a message catalogue
diff --git a/doc/html/boost_regex/background_information/standards.html b/doc/html/boost_regex/background_information/standards.html index d7d41ebe..6dcbf80d 100644 --- a/doc/html/boost_regex/background_information/standards.html +++ b/doc/html/boost_regex/background_information/standards.html @@ -28,7 +28,7 @@ Conformance
- + C++

@@ -36,7 +36,7 @@ Report on C++ Library Extensions.

- + ECMAScript / JavaScript
@@ -49,7 +49,7 @@ rather than a Unicode escape sequence; use \x{DDDD} for Unicode escape sequences.

- + Perl

@@ -73,7 +73,7 @@ the Unicode requirements below.

- + POSIX

@@ -93,7 +93,7 @@ a custom traits class.

- + Unicode

diff --git a/doc/html/boost_regex/captures.html b/doc/html/boost_regex/captures.html index 62fb0c3d..6b3ff537 100644 --- a/doc/html/boost_regex/captures.html +++ b/doc/html/boost_regex/captures.html @@ -35,7 +35,7 @@ accessed.

- + Marked sub-expressions

@@ -218,7 +218,7 @@ output stream.

- + Unmatched Sub-Expressions

@@ -231,7 +231,7 @@ you can determine which sub-expressions matched by accessing the sub_match::matched data member.

- + Repeated Captures

diff --git a/doc/html/boost_regex/format/boost_format_syntax.html b/doc/html/boost_regex/format/boost_format_syntax.html index 8efd8856..a52920a1 100644 --- a/doc/html/boost_regex/format/boost_format_syntax.html +++ b/doc/html/boost_regex/format/boost_format_syntax.html @@ -32,7 +32,7 @@ '$', '\', '(', ')', '?', and ':'.

- + Grouping

@@ -40,7 +40,7 @@ you want a to output literal parenthesis.

- + Conditionals

@@ -79,7 +79,7 @@ ?{NAME}true-expression:false-expression

- + Placeholder Sequences
@@ -319,7 +319,7 @@ as a literal.

- + Escape Sequences
diff --git a/doc/html/boost_regex/install.html b/doc/html/boost_regex/install.html index 3873e248..145fab5a 100644 --- a/doc/html/boost_regex/install.html +++ b/doc/html/boost_regex/install.html @@ -49,7 +49,7 @@ file before you can use it, instructions for specific platforms are as follows:

- + Building with bjam

@@ -58,7 +58,7 @@ started guide for more information.

- + Building With Unicode and ICU Support
@@ -158,11 +158,11 @@ header-include and linker-search paths).

- + Building via makefiles
- + Borland C++ Builder:
- + GCC(2.95 and later)

@@ -364,7 +364,7 @@ see the config library documentation.

- + Sun Workshop 6.1

@@ -409,7 +409,7 @@ will build v9 variants of the regex library named libboost_regex_v9.a etc.

- + Makefiles for Other compilers
diff --git a/doc/html/boost_regex/ref/bad_expression.html b/doc/html/boost_regex/ref/bad_expression.html index b0a392ae..717f348f 100644 --- a/doc/html/boost_regex/ref/bad_expression.html +++ b/doc/html/boost_regex/ref/bad_expression.html @@ -27,7 +27,7 @@ bad_expression
- + Synopsis 
#include <boost/pattern_except.hpp>
@@ -54,7 +54,7 @@
 } // namespace boost
- + Description 
regex_error(const std::string& s, regex_constants::error_type err, std::ptrdiff_t pos);
diff --git a/doc/html/boost_regex/ref/basic_regex.html b/doc/html/boost_regex/ref/basic_regex.html
index 44865b37..0fb676d5 100644
--- a/doc/html/boost_regex/ref/basic_regex.html
+++ b/doc/html/boost_regex/ref/basic_regex.html
@@ -27,7 +27,7 @@
 basic_regex
 
 

-
+
         Synopsis
       

 
#include <boost/regex.hpp>
@@ -244,7 +244,7 @@
 } // namespace boost
 

 

-
+
         Description
       

 

@@ -325,7 +325,7 @@
         basic_regex.
       

 

-
Table 1. basic_regex default construction postconditions

+
Table 1. basic_regex default construction postconditions

 
@@ -403,7 +403,7 @@
         flags specified in f.
       

-
Table 2. Postconditions for basic_regex construction

+
Table 2. Postconditions for basic_regex construction

 

 
 

 
@@ -506,7 +506,7 @@
         specified in f.
       

-
Table 3. Postconditions for basic_regex construction

+
Table 3. Postconditions for basic_regex construction

 

 
 

 
@@ -608,7 +608,7 @@
         according the option flags specified in f.
       

-
Table 4. Postconditions for basic_regex construction

+
Table 4. Postconditions for basic_regex construction

 

 
 

 
@@ -716,7 +716,7 @@
         flags specified in f.
       

-
Table 5. Postconditions for basic_regex construction

+
Table 5. Postconditions for basic_regex construction

 

 
 

 
@@ -816,7 +816,7 @@
         flags specified in f.
       

-
Table 6. Postconditions for basic_regex construction

+
Table 6. Postconditions for basic_regex construction

 

 
 

 
@@ -1002,7 +1002,7 @@
         in f.
       

-
Table 7. Postconditions for basic_regex::assign

+
Table 7. Postconditions for basic_regex::assign

 

 
 

 
diff --git a/doc/html/boost_regex/ref/concepts/traits_concept.html b/doc/html/boost_regex/ref/concepts/traits_concept.html
index becee9ce..b3e1d326 100644
--- a/doc/html/boost_regex/ref/concepts/traits_concept.html
+++ b/doc/html/boost_regex/ref/concepts/traits_concept.html
@@ -34,7 +34,7 @@
           Boost-specific enhanced interface.
         

-
+
           Minimal
           requirements.
         

@@ -378,7 +378,7 @@
 

 
 

 
 

 

-
+
           Additional
           Optional Requirements
         

diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html b/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
index 201ae3e8..64346cec 100644
--- a/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
@@ -34,7 +34,7 @@
           previous version of Boost.Regex and will not be further updated:
         

 

-
+
           Algorithm
           regex_format
         

diff --git a/doc/html/boost_regex/ref/error_type.html b/doc/html/boost_regex/ref/error_type.html
index 7fcb99e2..14869041 100644
--- a/doc/html/boost_regex/ref/error_type.html
+++ b/doc/html/boost_regex/ref/error_type.html
@@ -27,7 +27,7 @@
 error_type
 

 

-
+
         Synopsis
       

 

@@ -57,7 +57,7 @@
 } // namespace boost
- + Description

diff --git a/doc/html/boost_regex/ref/match_flag_type.html b/doc/html/boost_regex/ref/match_flag_type.html index 33d55ce6..dc9bd64e 100644 --- a/doc/html/boost_regex/ref/match_flag_type.html +++ b/doc/html/boost_regex/ref/match_flag_type.html @@ -69,7 +69,7 @@ } // namespace boost

- + Description

diff --git a/doc/html/boost_regex/ref/match_results.html b/doc/html/boost_regex/ref/match_results.html index 7a587305..cb60c81a 100644 --- a/doc/html/boost_regex/ref/match_results.html +++ b/doc/html/boost_regex/ref/match_results.html @@ -27,7 +27,7 @@ match_results

- + Synopsis 
#include <boost/regex.hpp>
@@ -167,7 +167,7 @@
          match_results<BidirectionalIterator, Allocator>& m2);
- + Description

diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html index 812cb80d..e77a9520 100644 --- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html +++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html @@ -43,7 +43,7 @@ on to the "real" algorithm.

- + u32regex_match

@@ -89,7 +89,7 @@ }

- + u32regex_search

@@ -128,7 +128,7 @@ }

- + u32regex_replace

diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html index 030ef13b..c0dbd749 100644 --- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html +++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html @@ -28,7 +28,7 @@ Aware Regex Iterators

- + u32regex_iterator

@@ -126,7 +126,7 @@ Provided of course that the input is encoded as UTF-8.

- + u32regex_token_iterator

diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html index 7b9d97ea..106400c1 100644 --- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html +++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html @@ -34,7 +34,7 @@ here they are anyway:

- + regex_match

@@ -82,7 +82,7 @@ }

- + regex_match (second overload)
@@ -110,7 +110,7 @@ }
- + regex_search

@@ -149,7 +149,7 @@ }

- + regex_search (second overload)
@@ -164,7 +164,7 @@ + s.GetLength(), e, f);

- + regex_replace

diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html index ceee130c..3b7337ae 100644 --- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html +++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html @@ -32,7 +32,7 @@ an MFC/ATL string to a regex_iterator or regex_token_iterator:

- + regex_iterator creation helper
@@ -68,7 +68,7 @@ }
- + regex_token_iterator creation helpers
diff --git a/doc/html/boost_regex/ref/posix.html b/doc/html/boost_regex/ref/posix.html index b3b98863..179dbb46 100644 --- a/doc/html/boost_regex/ref/posix.html +++ b/doc/html/boost_regex/ref/posix.html @@ -163,7 +163,7 @@

- + regcomp

@@ -375,7 +375,7 @@

- + regerror

@@ -461,7 +461,7 @@ buffer.

- + regexec

@@ -529,7 +529,7 @@

- + regfree

diff --git a/doc/html/boost_regex/ref/regex_iterator.html b/doc/html/boost_regex/ref/regex_iterator.html index 352216e2..a606c600 100644 --- a/doc/html/boost_regex/ref/regex_iterator.html +++ b/doc/html/boost_regex/ref/regex_iterator.html @@ -78,7 +78,7 @@ regex_constants::match_flag_type m = regex_constants::match_default);

- + Description

@@ -415,7 +415,7 @@ m.

- + Examples

diff --git a/doc/html/boost_regex/ref/regex_match.html b/doc/html/boost_regex/ref/regex_match.html index 45b385f3..eeacc58c 100644 --- a/doc/html/boost_regex/ref/regex_match.html +++ b/doc/html/boost_regex/ref/regex_match.html @@ -80,7 +80,7 @@ match_flag_type flags = match_default);

- + Description 
template <class BidirectionalIterator, class Allocator, class charT, class traits>
@@ -361,7 +361,7 @@
         Effects: Returns the result of regex_match(s.begin(), s.end(), e, flags).
       

 

-
+
         Examples
       

 

diff --git a/doc/html/boost_regex/ref/regex_replace.html b/doc/html/boost_regex/ref/regex_replace.html
index f74d8abc..1b1a8a49 100644
--- a/doc/html/boost_regex/ref/regex_replace.html
+++ b/doc/html/boost_regex/ref/regex_replace.html
@@ -53,7 +53,7 @@
                                   match_flag_type flags = match_default);
- + Description 
template <class OutputIterator, class BidirectionalIterator, class traits, class Formatter>
@@ -199,7 +199,7 @@
         and then returns result.
       

 

-
+
         Examples
       

 

diff --git a/doc/html/boost_regex/ref/regex_search.html b/doc/html/boost_regex/ref/regex_search.html
index 58e33f4f..070ecc4b 100644
--- a/doc/html/boost_regex/ref/regex_search.html
+++ b/doc/html/boost_regex/ref/regex_search.html
@@ -73,7 +73,7 @@
                   match_flag_type flags = match_default);
- + Description 
template <class BidirectionalIterator, class Allocator, class charT, class traits>
@@ -357,7 +357,7 @@
         Effects: Returns the result of regex_search(s.begin(), s.end(), e, flags).
       

 

-
+
         Examples
       

 

diff --git a/doc/html/boost_regex/ref/regex_token_iterator.html b/doc/html/boost_regex/ref/regex_token_iterator.html
index d3c6d957..62379e2c 100644
--- a/doc/html/boost_regex/ref/regex_token_iterator.html
+++ b/doc/html/boost_regex/ref/regex_token_iterator.html
@@ -136,7 +136,7 @@
          regex_constants::match_flag_type m = regex_constants::match_default);
- + Description 
regex_token_iterator();
@@ -357,7 +357,7 @@
         m.
       

 

-
+
         Examples
       

 

diff --git a/doc/html/boost_regex/ref/regex_traits.html b/doc/html/boost_regex/ref/regex_traits.html
index 86aa32c4..61052303 100644
--- a/doc/html/boost_regex/ref/regex_traits.html
+++ b/doc/html/boost_regex/ref/regex_traits.html
@@ -46,7 +46,7 @@
 } // namespace boost
- + Description

diff --git a/doc/html/boost_regex/ref/sub_match.html b/doc/html/boost_regex/ref/sub_match.html index 50f544a8..08ea2254 100644 --- a/doc/html/boost_regex/ref/sub_match.html +++ b/doc/html/boost_regex/ref/sub_match.html @@ -329,11 +329,11 @@ } // namespace boost

- + Description
- + Members 
typedef typename std::iterator_traits<iterator>::value_type value_type;
@@ -446,7 +446,7 @@
           
 
 

-
+
         sub_match
         non-member operators
       

@@ -883,7 +883,7 @@
         + m2.str().
       

 

-
+
         Stream inserter
       

 
template <class charT, class traits, class BidirectionalIterator>
diff --git a/doc/html/boost_regex/syntax/basic_extended.html b/doc/html/boost_regex/syntax/basic_extended.html
index fa466b74..03d2c215 100644
--- a/doc/html/boost_regex/syntax/basic_extended.html
+++ b/doc/html/boost_regex/syntax/basic_extended.html
@@ -28,7 +28,7 @@
       Expression Syntax
 
 

-
+
         Synopsis
       

 

@@ -44,7 +44,7 @@
 boost::regex e2(my_expression, boost::regex::extended|boost::regex::icase);
 

 

-
+
         POSIX
         Extended Syntax
       

@@ -54,7 +54,7 @@
       

 
.[{}()\*+?|^$

 

-
+
         Wildcard:
       

 

@@ -72,7 +72,7 @@
           
 
 

-
+
         Anchors:
       

 

@@ -84,7 +84,7 @@
         of an expression, or the last character of a sub-expression.
       

 

-
+
         Marked
         sub-expressions:
       

@@ -96,7 +96,7 @@
         to by a back-reference.
       

 

-
+
         Repeats:
       

 

@@ -182,7 +182,7 @@ cab
         operator to be applied to.
       

 

-
+
         Back references:
       

 

@@ -212,7 +212,7 @@ cab
         

 
 

-
+
         Alternation
       

 

@@ -225,7 +225,7 @@ cab
         will match either of "abd" or "abef".
       

 

-
+
         Character
         sets:
       

@@ -238,7 +238,7 @@ cab
         A bracket expression may contain any combination of the following:
       

 

-
+
         Single
         characters:
       

@@ -247,7 +247,7 @@ cab
         or 'c'.
       

 

-
+
         Character
         ranges:
       

@@ -263,7 +263,7 @@ cab
         the code points of the characters only.
       

 

-
+
         Negation:
       

 

@@ -272,7 +272,7 @@ cab
         range a-c.
       

 

-
+
         Character
         classes:
       

@@ -282,7 +282,7 @@ cab
         character class names.
       

 

-
+
         Collating
         Elements:
       

@@ -310,7 +310,7 @@ cab
         matches a NUL character.
       

 

-
+
         Equivalence
         classes:
       

@@ -327,7 +327,7 @@ cab
         or even all locales on one platform.
       

 

-
+
         Combinations:
       

 

@@ -335,7 +335,7 @@ cab
         [[:digit:]a-c[.NUL.]].
       

 

-
+
         Escapes
       

 

@@ -361,7 +361,7 @@ cab
         extensions are also supported by Boost.Regex:
       

 

-
+
         Escapes
         matching a specific character
       

@@ -550,7 +550,7 @@ cab
 
 
 

-
+
         "Single
         character" character classes:
       

@@ -704,7 +704,7 @@ cab
 
 
 

-
+
         Character
         Properties
       

@@ -811,7 +811,7 @@ cab
         matches any "digit" character, as does \p{digit}.
       

 

-
+
         Word Boundaries
       

 

@@ -886,7 +886,7 @@ cab
 
 
 

-
+
         Buffer
         boundaries
       

@@ -977,7 +977,7 @@ cab
 
 
 

-
+
         Continuation
         Escape
       

@@ -989,7 +989,7 @@ cab
         match to start where the last one ended.
       

 

-
+
         Quoting
         escape
       

@@ -1003,7 +1003,7 @@ cab
 \*+aaa
- + Unicode escapes
@@ -1054,7 +1054,7 @@ cab
- + Any other escape
@@ -1063,7 +1063,7 @@ cab \@ matches a literal '@'.

- + Operator precedence
@@ -1100,7 +1100,7 @@ cab
- + What Gets Matched
@@ -1110,11 +1110,11 @@ cab rule.

- + Variations

- + Egrep

@@ -1135,7 +1135,7 @@ cab used with the -E option.

- + awk

@@ -1149,7 +1149,7 @@ cab these by default anyway.

- + Options

@@ -1162,7 +1162,7 @@ cab modify how the case and locale sensitivity are to be applied.

- + References

diff --git a/doc/html/boost_regex/syntax/basic_syntax.html b/doc/html/boost_regex/syntax/basic_syntax.html index 94ad1851..7c262c71 100644 --- a/doc/html/boost_regex/syntax/basic_syntax.html +++ b/doc/html/boost_regex/syntax/basic_syntax.html @@ -28,7 +28,7 @@ Expression Syntax

- + Synopsis

@@ -43,7 +43,7 @@ boost::regex e2(my_expression, boost::regex::basic|boost::regex::icase);

- + POSIX Basic Syntax

@@ -53,7 +53,7 @@ 

.[\*^$
- + Wildcard:

@@ -71,7 +71,7 @@

- + Anchors:

@@ -83,7 +83,7 @@ of an expression, or the last character of a sub-expression.

- + Marked sub-expressions:
@@ -95,7 +95,7 @@ by a back-reference.

- + Repeats:

@@ -153,7 +153,7 @@ aaaa to.

- + Back references:

@@ -171,7 +171,7 @@ aaaa 

aaabba
- + Character sets:
@@ -184,7 +184,7 @@ aaaa A bracket expression may contain any combination of the following:

- + Single characters:
@@ -193,7 +193,7 @@ aaaa or 'c'.

- + Character ranges:
@@ -209,7 +209,7 @@ aaaa of the characters only.

- + Negation:

@@ -218,7 +218,7 @@ aaaa range a-c.

- + Character classes:
@@ -228,7 +228,7 @@ aaaa character class names.

- + Collating Elements:
@@ -257,7 +257,7 @@ aaaa element names.

- + Equivalence classes:
@@ -274,7 +274,7 @@ aaaa or even all locales on one platform.

- + Combinations:

@@ -282,7 +282,7 @@ aaaa [[:digit:]a-c[.NUL.]].

- + Escapes

@@ -297,7 +297,7 @@ aaaa will match either a literal '\' or a '^'.

- + What Gets Matched

@@ -307,11 +307,11 @@ aaaa rule.

- + Variations

- + Grep

@@ -329,7 +329,7 @@ aaaa As its name suggests, this behavior is consistent with the Unix utility grep.

- + emacs

@@ -609,7 +609,7 @@ aaaa leftmost-longest rule.

- + Options

@@ -623,7 +623,7 @@ aaaa options modify how the case and locale sensitivity are to be applied.

- + References

diff --git a/doc/html/boost_regex/syntax/perl_syntax.html b/doc/html/boost_regex/syntax/perl_syntax.html index 00e2b7e7..bc1a78fa 100644 --- a/doc/html/boost_regex/syntax/perl_syntax.html +++ b/doc/html/boost_regex/syntax/perl_syntax.html @@ -28,7 +28,7 @@ Syntax

- + Synopsis

@@ -43,7 +43,7 @@ boost::regex e2(my_expression, boost::regex::perl|boost::regex::icase);

- + Perl Regular Expression Syntax

@@ -53,7 +53,7 @@ 

.[{}()\*+?|^$
- + Wildcard

@@ -73,7 +73,7 @@

- + Anchors

@@ -83,7 +83,7 @@ A '$' character shall match the end of a line.

- + Marked sub-expressions
@@ -94,7 +94,7 @@ can also repeated, or referred to by a back-reference.

- + Non-marking grouping
@@ -107,7 +107,7 @@ without splitting out any separate sub-expressions.

- + Repeats

@@ -188,7 +188,7 @@ to be applied to.

- + Non greedy repeats
@@ -218,7 +218,7 @@ while consuming as little input as possible.

- + Possessive repeats
@@ -250,7 +250,7 @@ while giving nothing back.

- + Back references

@@ -360,7 +360,7 @@ named "two".

- + Alternation

@@ -387,7 +387,7 @@ (?:abc)?? has exactly the same effect.

- + Character sets

@@ -399,7 +399,7 @@ A bracket expression may contain any combination of the following:

- + Single characters

@@ -407,7 +407,7 @@ 'b', or 'c'.

- + Character ranges
@@ -421,7 +421,7 @@ sensitive.

- + Negation

@@ -430,7 +430,7 @@ matches any character that is not in the range a-c.

- + Character classes
@@ -441,7 +441,7 @@ class names.

- + Collating Elements
@@ -463,7 +463,7 @@ matches a \0 character.

- + Equivalence classes
@@ -480,7 +480,7 @@ or even all locales on one platform.

- + Escaped Characters
@@ -492,7 +492,7 @@ is not a "word" character.

- + Combinations

@@ -500,7 +500,7 @@ [[:digit:]a-c[.NUL.]].

- + Escapes

@@ -692,7 +692,7 @@

- + "Single character" character classes:
@@ -894,7 +894,7 @@
- + Character Properties
@@ -1002,7 +1002,7 @@ as does \p{digit}.

- + Word Boundaries

@@ -1021,7 +1021,7 @@ \B Matches only when not at a word boundary.

- + Buffer boundaries

@@ -1048,7 +1048,7 @@ (?=\n?\z).

- + Continuation Escape
@@ -1060,7 +1060,7 @@ one ended.

- + Quoting escape

@@ -1073,7 +1073,7 @@ \*+aaa

- + Unicode escapes

@@ -1083,7 +1083,7 @@ followed by a sequence of zero or more combining characters.

- + Matching Line Endings
@@ -1092,7 +1092,7 @@ sequence, specifically it is identical to the expression (?>\x0D\x0A?|[\x0A-\x0C\x85\x{2028}\x{2029}]).

- + Keeping back some text
@@ -1107,7 +1107,7 @@ This can be used to simulate variable width lookbehind assertions.

- + Any other escape
@@ -1116,7 +1116,7 @@ \@ matches a literal '@'.

- + Perl Extended Patterns
@@ -1125,7 +1125,7 @@ (?.

- + Named Subexpressions
@@ -1147,14 +1147,14 @@ format string for search and replace operations, or in the match_results member functions.

- + Comments

(?# ... ) is treated as a comment, it's contents are ignored.

- + Modifiers

@@ -1168,7 +1168,7 @@ pattern only.

- + Non-marking groups
@@ -1177,7 +1177,7 @@ an additional sub-expression.

- + Branch reset

@@ -1199,7 +1199,7 @@ # 1 2 2 3 2 3 4

- + Lookahead

@@ -1222,7 +1222,7 @@ could be used to validate the password.

- + Lookbehind

@@ -1236,7 +1236,7 @@ (pattern must be of fixed length).

- + Independent sub-expressions
@@ -1249,13 +1249,13 @@ no match is found at all.

- + Recursive Expressions

(?N) (?-N) (?+N) - (?R) (?0) + (?R) (?0) (?&NAME)

(?R) and (?0) recurse to the start @@ -1272,8 +1272,11 @@ to the last sub-expression to be declared, and (?+1) recurses to the next sub-expression to be declared.

+

+ (?&NAME) recurses to named sub-expression NAME. +

- + Conditional Expressions
@@ -1323,7 +1326,7 @@
- + Operator precedence
@@ -1358,7 +1361,7 @@

- + What gets matched

@@ -1534,7 +1537,7 @@

- + Variations

@@ -1543,7 +1546,7 @@ and JScript are all synonyms for perl.

- + Options

@@ -1555,7 +1558,7 @@ are to be applied.

- + Pattern Modifiers

@@ -1567,7 +1570,7 @@ and no_mod_s.

- + References

diff --git a/doc/html/boost_regex/unicode.html b/doc/html/boost_regex/unicode.html index 12729aee..04f48de3 100644 --- a/doc/html/boost_regex/unicode.html +++ b/doc/html/boost_regex/unicode.html @@ -30,7 +30,7 @@ There are two ways to use Boost.Regex with Unicode strings:

- + Rely on wchar_t

@@ -56,7 +56,7 @@

- + Use a Unicode Aware Regular Expression Type.
diff --git a/doc/html/index.html b/doc/html/index.html index 91866311..5115fb6a 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -28,7 +28,7 @@

Copyright © 1998 -2010 John Maddock

-

+

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

@@ -195,7 +195,7 @@

- +

Last revised: April 26, 2011 at 08:43:03 GMT

Last revised: May 16, 2011 at 17:07:46 GMT
diff --git a/doc/syntax_perl.qbk b/doc/syntax_perl.qbk index 4abf94a4..21d873b6 100644 --- a/doc/syntax_perl.qbk +++ b/doc/syntax_perl.qbk @@ -514,7 +514,7 @@ whole to match then no match is found at all. [h5 Recursive Expressions] -[^(?['N]) (?-['N]) (?+['N]) (?R) (?0)] +[^(?['N]) (?-['N]) (?+['N]) (?R) (?0) (?&NAME)] =(?R)= and =(?0)= recurse to the start of the entire pattern. @@ -523,6 +523,8 @@ whole to match then no match is found at all. [^(?-['N])] and [^(?+['N])] are relative recursions, so for example =(?-1)= recurses to the last sub-expression to be declared, and =(?+1)= recurses to the next sub-expression to be declared. +[^(?&NAME)] recurses to named sub-expression ['NAME]. + [h5 Conditional Expressions] =(?(condition)yes-pattern|no-pattern)= attempts to match /yes-pattern/ if From 27ad285fbf2ef5a64deaa5ef66b5f72fe1dd3f62 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Fri, 10 Jun 2011 17:03:48 +0000 Subject: [PATCH 4/9] Fix access violation caused by past-the-end iterator deference for expressions such as ".*?". [SVN r72540] --- include/boost/regex/v4/basic_regex_parser.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/boost/regex/v4/basic_regex_parser.hpp b/include/boost/regex/v4/basic_regex_parser.hpp index 0192a9f1..f9d4399b 100644 --- a/include/boost/regex/v4/basic_regex_parser.hpp +++ b/include/boost/regex/v4/basic_regex_parser.hpp @@ -941,7 +941,8 @@ bool basic_regex_parser::parse_repeat(std::size_t low, std::size_ ++m_position; } // for perl regexes only check for pocessive ++ repeats. - if((0 == (this->flags() & regbase::main_option_type)) + if((m_position != m_end) + && (0 == (this->flags() & regbase::main_option_type)) && (this->m_traits.syntax_type(*m_position) == regex_constants::syntax_plus)) { pocessive = true; From 6c181b02ba52ae63ddd4d2037a7a6a6061c8f7d9 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Fri, 10 Jun 2011 17:17:14 +0000 Subject: [PATCH 5/9] Add some typecasts to prevent copying a buffer twice (makes sure we find the correct overload of assign). [SVN r72541] --- include/boost/regex/v4/basic_regex.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/regex/v4/basic_regex.hpp b/include/boost/regex/v4/basic_regex.hpp index 53b7bcaa..1e71877e 100644 --- a/include/boost/regex/v4/basic_regex.hpp +++ b/include/boost/regex/v4/basic_regex.hpp @@ -398,7 +398,7 @@ public: typedef typename traits::string_type seq_type; seq_type a(arg_first, arg_last); if(a.size()) - assign(&*a.begin(), &*a.begin() + a.size(), f); + assign(static_cast(&*a.begin()), static_cast(&*a.begin() + a.size()), f); else assign(static_cast(0), static_cast(0), f); } From fbf5c7d62c09e49a0c0efcdaf3ddad81bb213596 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Thu, 16 Jun 2011 11:27:13 +0000 Subject: [PATCH 6/9] Fix infinite recursion in bad recursive expressions. Fix bug that allows invalid regex to go unnoticed and crash later. Fixes #5613. Fixes #5612. [SVN r72612] --- .../boost/regex/v4/basic_regex_creator.hpp | 23 +++++++++++++++---- include/boost/regex/v4/basic_regex_parser.hpp | 3 ++- test/regress/test_perl_ex.cpp | 1 + test/regress/test_simple_repeats.cpp | 3 +++ 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/include/boost/regex/v4/basic_regex_creator.hpp b/include/boost/regex/v4/basic_regex_creator.hpp index efa9f7dd..6c1acd78 100644 --- a/include/boost/regex/v4/basic_regex_creator.hpp +++ b/include/boost/regex/v4/basic_regex_creator.hpp @@ -241,6 +241,7 @@ protected: unsigned m_backrefs; // bitmask of permitted backrefs boost::uintmax_t m_bad_repeats; // bitmask of repeats we can't deduce a startmap for; bool m_has_recursions; // set when we have recursive expresisons to fixup + std::vector m_recursion_checks; // notes which recursions we've followed while analysing this expression typename traits::char_class_type m_word_mask; // mask used to determine if a character is a word character typename traits::char_class_type m_mask_space; // mask used to determine if a character is a word character typename traits::char_class_type m_lower_mask; // mask used to determine if a character is a lowercase character @@ -712,6 +713,8 @@ void basic_regex_creator::finalize(const charT* p1, const charT* m_pdata->m_can_be_null = 0; m_bad_repeats = 0; + if(m_has_recursions) + m_recursion_checks.assign(1 + m_pdata->m_mark_count, false); create_startmap(m_pdata->m_first_state, m_pdata->m_startmap, &(m_pdata->m_can_be_null), mask_all); // get the restart type: m_pdata->m_restart_type = get_restart_type(m_pdata->m_first_state); @@ -948,9 +951,14 @@ void basic_regex_creator::create_startmaps(re_syntax_base* state) state = state->next.p; } } + // now work through our list, building all the maps as we go: while(v.size()) { + // Initialize m_recursion_checks if we need it: + if(m_has_recursions) + m_recursion_checks.assign(1 + m_pdata->m_mark_count, false); + const std::pair& p = v.back(); m_icase = p.first; state = p.second; @@ -960,6 +968,9 @@ void basic_regex_creator::create_startmaps(re_syntax_base* state) m_bad_repeats = 0; create_startmap(state->next.p, static_cast(state)->_map, &static_cast(state)->can_be_null, mask_take); m_bad_repeats = 0; + + if(m_has_recursions) + m_recursion_checks.assign(1 + m_pdata->m_mark_count, false); create_startmap(static_cast(state)->alt.p, static_cast(state)->_map, &static_cast(state)->can_be_null, mask_skip); // adjust the type of the state to allow for faster matching: state->type = this->get_repeat_type(state); @@ -1114,7 +1125,11 @@ void basic_regex_creator::create_startmap(re_syntax_base* state, } case syntax_element_recurse: { - if(recursion_start == state) + if(state->type == syntax_element_startmark) + recursion_sub = static_cast(state)->index; + else + recursion_sub = 0; + if(m_recursion_checks[recursion_sub]) { // Infinite recursion!! if(0 == this->m_pdata->m_status) // update the error code if not already set @@ -1139,12 +1154,10 @@ void basic_regex_creator::create_startmap(re_syntax_base* state, recursion_start = state; recursion_restart = state->next.p; state = static_cast(state)->alt.p; - if(state->type == syntax_element_startmark) - recursion_sub = static_cast(state)->index; - else - recursion_sub = 0; + m_recursion_checks[recursion_sub] = true; break; } + m_recursion_checks[recursion_sub] = true; // fall through, can't handle nested recursion here... } case syntax_element_backref: diff --git a/include/boost/regex/v4/basic_regex_parser.hpp b/include/boost/regex/v4/basic_regex_parser.hpp index f9d4399b..87ff6e20 100644 --- a/include/boost/regex/v4/basic_regex_parser.hpp +++ b/include/boost/regex/v4/basic_regex_parser.hpp @@ -1026,13 +1026,14 @@ bool basic_regex_parser::parse_repeat(std::size_t low, std::size_ { // // Check for illegal following quantifier, we have to do this here, because - // the extra states we insert below circumvents are usual error checking :-( + // the extra states we insert below circumvents our usual error checking :-( // switch(this->m_traits.syntax_type(*m_position)) { case regex_constants::syntax_star: case regex_constants::syntax_plus: case regex_constants::syntax_question: + case regex_constants::syntax_open_brace: fail(regex_constants::error_badrepeat, m_position - m_base); return false; } diff --git a/test/regress/test_perl_ex.cpp b/test/regress/test_perl_ex.cpp index 3307d314..8a14b826 100644 --- a/test/regress/test_perl_ex.cpp +++ b/test/regress/test_perl_ex.cpp @@ -908,6 +908,7 @@ void test_recursion() // Bugs: TEST_REGEX_SEARCH("namespace\\s+(\\w+)\\s+(\\{(?:[^{}]*(?:(?2)[^{}]*)*)?\\})", perl, "namespace one { namespace two { int foo(); } }", match_default, make_array(0, 46, 10, 13, 14, 46, -2, -2)); TEST_REGEX_SEARCH("namespace\\s+(\\w+)\\s+(\\{(?:[^{}]*(?:(?2)[^{}]*)*)?\\})", perl, "namespace one { namespace two { int foo(){} } { {{{ } } } } {}}", match_default, make_array(0, 64, 10, 13, 14, 64, -2, -2)); + TEST_INVALID_REGEX("((?1)|a)", perl); // Recursion to a named sub with a name that is used multiple times: TEST_REGEX_SEARCH("(?:(?a+)|(?b+))\\.(?&A)", perl, "aaaa.aa", match_default, make_array(0, 7, 0, 4, -1, -1, -2, -2)); diff --git a/test/regress/test_simple_repeats.cpp b/test/regress/test_simple_repeats.cpp index 30bcae5a..044ca2fd 100644 --- a/test/regress/test_simple_repeats.cpp +++ b/test/regress/test_simple_repeats.cpp @@ -477,6 +477,9 @@ void test_pocessive_repeats() TEST_REGEX_SEARCH("x{1,4}+\\w", perl, "xxxxxa", match_default, make_array(0, 5, -2, -2)); TEST_REGEX_SEARCH("x{1,3}+\\w", perl, "xxxxxa", match_default, make_array(0, 4, -2, 4, 6, -2, -2)); TEST_INVALID_REGEX("\\d+++", perl); + TEST_INVALID_REGEX("\\d++*", perl); + TEST_INVALID_REGEX("\\d++?", perl); + TEST_INVALID_REGEX("\\d++{3}", perl); TEST_INVALID_REGEX("\\d*++", perl); TEST_INVALID_REGEX("\\d?++", perl); TEST_INVALID_REGEX("\\d{1,2}++", perl); From 2fb19b66e09b36a02a672f7c758c397b2171ec84 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Wed, 29 Jun 2011 18:17:47 +0000 Subject: [PATCH 7/9] Update tests for ICU-4.8 and Unicode version 6. [SVN r72801] --- test/regress/test_unicode.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/regress/test_unicode.cpp b/test/regress/test_unicode.cpp index f84aa3ab..eed5b456 100644 --- a/test/regress/test_unicode.cpp +++ b/test/regress/test_unicode.cpp @@ -75,8 +75,8 @@ void test_unicode() TEST_REGEX_CLASS_U(Non-Spacing Mark, 20EA); TEST_REGEX_CLASS_U(Mc, 1938); TEST_REGEX_CLASS_U(Spacing Combining Mark, 1938); - TEST_REGEX_CLASS_U(Me, 06DE); - TEST_REGEX_CLASS_U(Enclosing Mark, 06DE); + TEST_REGEX_CLASS_U(Me, 0488); + TEST_REGEX_CLASS_U(Enclosing Mark, 0488); TEST_REGEX_CLASS_U(N*, 0669); TEST_REGEX_CLASS_U(Number, 0669); TEST_REGEX_CLASS_U(Nd, 0669); From 03ef9626ba349b188ac2b2b450402c1ceaa11232 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Thu, 30 Jun 2011 12:23:43 +0000 Subject: [PATCH 8/9] Set the Unicode locale to a "know good", otherwise a few tests fail on Linux. [SVN r72816] --- test/regress/main.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/regress/main.cpp b/test/regress/main.cpp index 85ece016..0fcd0921 100644 --- a/test/regress/main.cpp +++ b/test/regress/main.cpp @@ -20,6 +20,10 @@ #include "test_locale.hpp" #include +#ifdef BOOST_HAS_ICU +#include +#endif + #ifdef TEST_THREADS #include #include @@ -82,6 +86,19 @@ void run_tests() int cpp_main(int /*argc*/, char * /*argv*/[]) { +#ifdef BOOST_HAS_ICU + // + // We need to set the default locale used by ICU, + // otherwise some of our tests using equivalence classes fail. + // + UErrorCode err = U_ZERO_ERROR; + uloc_setDefault("en", &err); + if(err != U_ZERO_ERROR) + { + std::cerr << "Unable to set the default ICU locale to \"en\"." << std::endl; + return -1; + } +#endif #ifdef TEST_THREADS try{ get_array_data(); // initialises data. From d08bfeff255f7c49aeaa87d97e983bc7eb226ac0 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Thu, 21 Jul 2011 10:01:09 +0000 Subject: [PATCH 9/9] Add checked constructors to the Unicode iterators that need them. Update icu support code to use the new checking-constructors. Update tests to check the full Unicode character range (as of Unicode V6). Add minimal docs describing the iterators. [SVN r73271] --- .../boost_regex/background_information.html | 12 +- .../acknowledgements.html | 6 +- .../background_information/examples.html | 58 +++--- .../background_information/faq.html | 6 +- .../background_information/futher.html | 6 +- .../background_information/headers.html | 6 +- .../background_information/history.html | 138 ++++++------- .../background_information/locale.html | 44 +---- .../background_information/performance.html | 12 +- .../background_information/redist.html | 6 +- .../background_information/standards.html | 16 +- .../background_information/thread_safety.html | 6 +- doc/html/boost_regex/captures.html | 18 +- doc/html/boost_regex/configuration.html | 6 +- .../boost_regex/configuration/algorithm.html | 6 +- .../boost_regex/configuration/compiler.html | 6 +- .../boost_regex/configuration/linkage.html | 6 +- .../boost_regex/configuration/locale.html | 6 +- .../boost_regex/configuration/tuning.html | 6 +- doc/html/boost_regex/format.html | 6 +- .../format/boost_format_syntax.html | 14 +- doc/html/boost_regex/format/perl_format.html | 6 +- doc/html/boost_regex/format/sed_format.html | 6 +- doc/html/boost_regex/install.html | 47 +++-- .../introduction_and_overview.html | 10 +- doc/html/boost_regex/partial_matches.html | 96 ++++----- doc/html/boost_regex/ref.html | 9 +- doc/html/boost_regex/ref/bad_expression.html | 20 +- doc/html/boost_regex/ref/basic_regex.html | 102 +++++----- doc/html/boost_regex/ref/concepts.html | 6 +- .../ref/concepts/charT_concept.html | 6 +- .../ref/concepts/iterator_concepts.html | 6 +- .../ref/concepts/traits_concept.html | 10 +- .../ref/deprecated_interfaces.html | 6 +- .../ref/deprecated_interfaces/old_regex.html | 28 +-- .../deprecated_interfaces/regex_format.html | 8 +- .../ref/deprecated_interfaces/regex_grep.html | 142 +++++++------- .../deprecated_interfaces/regex_split.html | 20 +- doc/html/boost_regex/ref/error_type.html | 16 +- .../boost_regex/ref/internal_details.html | 45 +++++ .../ref/internal_details/uni_iter.html | 183 ++++++++++++++++++ doc/html/boost_regex/ref/match_flag_type.html | 14 +- doc/html/boost_regex/ref/match_results.html | 50 ++--- doc/html/boost_regex/ref/non_std_strings.html | 6 +- .../boost_regex/ref/non_std_strings/icu.html | 6 +- .../ref/non_std_strings/icu/intro.html | 14 +- .../ref/non_std_strings/icu/unicode_algo.html | 76 ++++---- .../ref/non_std_strings/icu/unicode_iter.html | 30 +-- .../non_std_strings/icu/unicode_types.html | 6 +- .../ref/non_std_strings/mfc_strings.html | 6 +- .../non_std_strings/mfc_strings/mfc_algo.html | 62 +++--- .../mfc_strings/mfc_intro.html | 6 +- .../non_std_strings/mfc_strings/mfc_iter.html | 22 +-- .../mfc_strings/mfc_regex_create.html | 6 +- .../mfc_strings/mfc_regex_types.html | 6 +- doc/html/boost_regex/ref/posix.html | 14 +- doc/html/boost_regex/ref/regex_iterator.html | 66 +++---- doc/html/boost_regex/ref/regex_match.html | 32 +-- doc/html/boost_regex/ref/regex_replace.html | 50 ++--- doc/html/boost_regex/ref/regex_search.html | 38 ++-- .../boost_regex/ref/regex_token_iterator.html | 36 ++-- doc/html/boost_regex/ref/regex_traits.html | 26 +-- doc/html/boost_regex/ref/sub_match.html | 74 +++---- .../boost_regex/ref/syntax_option_type.html | 6 +- .../syntax_option_type_basic.html | 6 +- .../syntax_option_type_extended.html | 6 +- .../syntax_option_type_literal.html | 6 +- .../syntax_option_type_overview.html | 6 +- .../syntax_option_type_perl.html | 6 +- .../syntax_option_type_synopsis.html | 40 ++-- doc/html/boost_regex/syntax.html | 14 +- .../boost_regex/syntax/basic_extended.html | 112 +++++------ doc/html/boost_regex/syntax/basic_syntax.html | 64 +++--- .../boost_regex/syntax/character_classes.html | 6 +- .../optional_char_class_names.html | 6 +- .../character_classes/std_char_clases.html | 6 +- .../boost_regex/syntax/collating_names.html | 6 +- .../syntax/collating_names/digraphs.html | 6 +- .../syntax/collating_names/named_unicode.html | 6 +- .../collating_names/posix_symbolic_names.html | 6 +- .../syntax/leftmost_longest_rule.html | 22 +-- doc/html/boost_regex/syntax/perl_syntax.html | 164 ++++++++-------- doc/html/boost_regex/unicode.html | 18 +- doc/html/index.html | 13 +- doc/regex.qbk | 4 + include/boost/regex/icu.hpp | 10 +- .../boost/regex/pending/unicode_iterator.hpp | 71 ++++++- test/Jamfile.v2 | 3 +- test/unicode/unicode_iterator_test.cpp | 93 ++++++++- 89 files changed, 1426 insertions(+), 1088 deletions(-) create mode 100644 doc/html/boost_regex/ref/internal_details.html create mode 100644 doc/html/boost_regex/ref/internal_details/uni_iter.html diff --git a/doc/html/boost_regex/background_information.html b/doc/html/boost_regex/background_information.html index c360f6bb..ccd9ff3a 100644 --- a/doc/html/boost_regex/background_information.html +++ b/doc/html/boost_regex/background_information.html @@ -3,10 +3,10 @@ Background Information - + - + @@ -20,9 +20,9 @@
-PrevUpHomeNext +PrevUpHomeNext
-
+
@@ -46,7 +46,7 @@
-
Copyright © 1998 -2010 John Maddock

+

Copyright © 1998-2010 John Maddock

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

@@ -54,7 +54,7 @@
-PrevUpHomeNext +PrevUpHomeNext
diff --git a/doc/html/boost_regex/background_information/acknowledgements.html b/doc/html/boost_regex/background_information/acknowledgements.html index f0f20f8b..965257cd 100644 --- a/doc/html/boost_regex/background_information/acknowledgements.html +++ b/doc/html/boost_regex/background_information/acknowledgements.html @@ -3,7 +3,7 @@ Acknowledgements - + @@ -22,7 +22,7 @@
PrevUpHomeNext
-
+
@@ -73,7 +73,7 @@
-
Copyright © 1998 -2010 John Maddock

+

Copyright © 1998-2010 John Maddock

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_regex/background_information/examples.html b/doc/html/boost_regex/background_information/examples.html index af965f48..8dd3837f 100644 --- a/doc/html/boost_regex/background_information/examples.html +++ b/doc/html/boost_regex/background_information/examples.html @@ -3,7 +3,7 @@ Test and Example Programs - + @@ -22,13 +22,13 @@
PrevUpHomeNext
-
+
- + Test Programs
@@ -45,71 +45,71 @@

Files:

-
-
Copyright © 1998 -2010 John Maddock

+

Copyright © 1998-2010 John Maddock

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_regex/background_information/faq.html b/doc/html/boost_regex/background_information/faq.html index 3cdcebc4..98fc86a9 100644 --- a/doc/html/boost_regex/background_information/faq.html +++ b/doc/html/boost_regex/background_information/faq.html @@ -3,7 +3,7 @@ FAQ - + @@ -22,7 +22,7 @@
PrevUpHomeNext
-
+

FAQ

@@ -141,7 +141,7 @@
-
Copyright © 1998 -2010 John Maddock

+

Copyright © 1998-2010 John Maddock

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_regex/background_information/futher.html b/doc/html/boost_regex/background_information/futher.html index 08bb520d..1e4c4114 100644 --- a/doc/html/boost_regex/background_information/futher.html +++ b/doc/html/boost_regex/background_information/futher.html @@ -3,7 +3,7 @@ References and Further Information - + @@ -22,7 +22,7 @@
PrevUpHomeNext
-
+
-
Copyright © 1998 -2010 John Maddock

+

Copyright © 1998-2010 John Maddock

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_regex/background_information/headers.html b/doc/html/boost_regex/background_information/headers.html index b4a7f5a6..d3988ba7 100644 --- a/doc/html/boost_regex/background_information/headers.html +++ b/doc/html/boost_regex/background_information/headers.html @@ -3,7 +3,7 @@ Headers - + @@ -22,7 +22,7 @@
PrevUpHomeNext
-
+
@@ -40,7 +40,7 @@
-
Copyright © 1998 -2010 John Maddock

+

Copyright © 1998-2010 John Maddock

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_regex/background_information/history.html b/doc/html/boost_regex/background_information/history.html index e819d0c0..53a7742e 100644 --- a/doc/html/boost_regex/background_information/history.html +++ b/doc/html/boost_regex/background_information/history.html @@ -3,7 +3,7 @@ History - + @@ -21,7 +21,7 @@
PrevUpHome
-
+
@@ -36,7 +36,7 @@ All issues including closed ones can be viewed here.

- + Boost 1.47
@@ -49,7 +49,7 @@ #5504.

- + Boost 1.44
@@ -68,22 +68,22 @@ #3890

- + Boost 1.42
-
    -
  • +
      +
    • Added support for Functors rather than strings as format expressions.
      • -
    • +
    • Improved error reporting when throwing exceptions to include better more relevant information.
      • -
    • +
    • Improved performance and reduced stack usage of recursive expressions.
      • -
    • +
    • Fixed tickets #2802, #3425, #3507, @@ -97,21 +97,21 @@
    - + Boost 1.40
    -
    • +
      • Added support for many Perl 5.10 syntax elements including named sub-expressions, branch resets and recursive regular expressions.
      - + Boost 1.38
      -
        -
      • +
          +
        • Breaking change: empty expressions, and empty alternatives are now allowed when using the Perl regular expression syntax. This change has been added for Perl compatibility, when the new @@ -119,124 +119,124 @@ no_empty_expressions is set then the old behaviour is preserved and empty expressions are prohibited. This is issue #1081.
          • -
        • +
        • Added support for Perl style ${n} expressions in format strings (issue #2556).
          • -
        • +
        • Added support for accessing the location of sub-expressions within the regular expression string (issue #2269).
          • -
        • +
        • Fixed compiler compatibility issues #2244, #2514, and #2458.
        - + Boost 1.34
        -
          -
        • +
            +
          • Fix for non-greedy repeats and partial matches not working correctly in some cases.
            • -
          • +
          • Fix for non-greedy repeats on VC++ not working in some cases (bug report 1515830).
            • -
          • +
          • Changed match_results::position() to return a valid result when *this represents a partial match.
            • -
          • +
          • Fixed the grep and egrep options so that the newline character gets treated the same as |.
          - + Boost 1.33.1
          -
            -
          • +
              +
            • Fixed broken makefiles.
              • -
            • +
            • Fixed configuration setup to allow building with VC7.1 - STLport-4.6.2 when using /Zc:wchar_t.
              • -
            • +
            • Moved declarations class-inline in static_mutex.hpp so that SGI Irix compiler can cope.
              • -
            • +
            • Added needed standard library #includes to fileiter.hpp, regex_workaround.hpp and cpp_regex_traits.hpp.
              • -
            • +
            • Fixed a bug where non-greedy repeats could in certain strange curcumstances repeat more times than their maximum value.
              • -
            • +
            • Fixed the value returned by basic_regex<>::empty() from a default constructed object.
              • -
            • +
            • Changed the deffinition of regex_error to make it backwards compatible with Boost-1.32.0.
              • -
            • +
            • Disabled external templates for Intel C++ 8.0 and earlier - otherwise unresolved references can occur.
              • -
            • +
            • Rewritten extern template code for gcc so that only specific member functions are exported: otherwise strange unresolved references can occur when linking and mixing debug and non-debug code.
              • -
            • +
            • Initialise all the data members of the unicode_iterators: this keeps gcc from issuing needless warnings.
              • -
            • +
            • Ported the ICU integration code to VC6 and VC7.
              • -
            • +
            • Ensured code is STLport debug mode clean.
              • -
            • +
            • Fixed lookbehind assertions so that fixed length repeats are permitted, and so that regex iteration allows lookbehind to look back before the current search range (into the last match).
              • -
            • +
            • Fixed strange bug with non-greedy repeats inside forward lookahead assertions.
              • -
            • +
            • Enabled negated character classes inside character sets.
              • -
            • +
            • Fixed regression so that [a-z-] is a valid expression again.
              • -
            • +
            • Fixed bug that allowed some invalid expressions to be accepted.
            - + Boost 1.33.0
            -
              -
            • +
                +
              • Completely rewritten expression parsing code, and traits class support; now conforms to the standardization proposal.
                • -
              • +
              • Breaking Change: The syntax options that can be passed to basic_regex constructors have been rationalized. The default option (perl) now has a value of zero, and it is now clearly documented which options apply @@ -245,35 +245,35 @@ is the possibility that existing code may fail to compile: however equivalent functionality should still be available.
                • -
              • +
              • Breaking Change: POSIX-extended and POSIX-basic regular expressions now enforce the letter of the POSIX standard much more closely than before.
                • -
              • +
              • Added support for (?imsx-imsx) constructs.
                • -
              • +
              • Added support for lookbehind expressions (?<=positive-lookbehind) and (?<!negative-lookbehind).
                • -
              • +
              • Added support for conditional expressions (?(assertion)true-expresion|false-expression).
                • -
              • +
              • Added MFC/ATL string wrappers.
                • -
              • +
              • Added Unicode support; based on ICU.
                • -
              • +
              • Changed newline support to recognise \f as a line separator (all character types), and \x85 as a line separator for wide characters / Unicode only.
                • -
              • +
              • Added a new format flag format_literal that treats the replace string as a literal, rather than a Perl or Sed style format string.
                • -
              • +
              • Errors are now reported by throwing exceptions of type regex_error. The types used previously - bad_expression and bad_pattern - are now just typedefs for regex_error. Type regex_error has a couple of new members: @@ -282,44 +282,44 @@
              - + Boost 1.32.1
              -
              • +
                • Fixed bug in partial matches of bounded repeats of '.'.
                - + Boost 1.31.0
                -
                  -
                • +
                    +
                  • Completely rewritten pattern matching code - it is now up to 10 times faster than before.
                    • -
                  • +
                  • Reorganized documentation.
                    • -
                  • +
                  • Deprecated all interfaces that are not part of the regular expression standardization proposal.
                    • -
                  • +
                  • Added regex_iterator and regex_token_iterator .
                    • -
                  • +
                  • Added support for Perl style independent sub-expressions.
                    • -
                  • +
                  • Added non-member operators to the sub_match class, so that you can compare sub_match's with strings, or add them to a string to produce a new string.
                    • -
                  • +
                  • Added experimental support for extended capture information.
                    • -
                  • +
                  • Changed the match flags so that they are a distinct type (not an integer), if you try to pass the match flags as an integer rather than match_flag_type to the regex algorithms then you will now get a compiler error. @@ -328,7 +328,7 @@
                  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
                  Copyright © 1998 -2010 John Maddock

                  +

                  Copyright © 1998-2010 John Maddock

                  Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                  diff --git a/doc/html/boost_regex/background_information/locale.html b/doc/html/boost_regex/background_information/locale.html index 014b73f8..b7f17b07 100644 --- a/doc/html/boost_regex/background_information/locale.html +++ b/doc/html/boost_regex/background_information/locale.html @@ -3,7 +3,7 @@ Localization - + @@ -22,7 +22,7 @@
                  PrevUpHomeNext
                  -
                  +
                  @@ -58,7 +58,7 @@ There are three separate localization mechanisms supported by Boost.Regex:

                  - + Win32 localization model.
                  @@ -90,7 +90,7 @@ are treated as "unknown" graphic characters.

                  - + C localization model.
                  @@ -114,7 +114,7 @@ libraries including version 1 of this library.

                  - + C++ localization model.
                  @@ -151,7 +151,7 @@ in your code. The best way to ensure this is to add the #define to <boost/regex/user.hpp>.

                  - + Providing a message catalogue
                  @@ -1303,9 +1303,6 @@ "Unmatched \{"

                  		   
                  @@ -1323,9 +1320,6 @@ "Invalid content of \{\}"

                  		   
                  @@ -1343,9 +1337,6 @@ "Invalid range end"

                  		   
                  @@ -1363,9 +1354,6 @@ "Memory exhausted"

                  		   
                  @@ -1383,9 +1371,6 @@ "Invalid preceding regular expression"

                  		   
                  @@ -1403,9 +1388,6 @@ "Premature end of regular expression"

                  		   
                  @@ -1423,9 +1405,6 @@ "Regular expression too big"

                  		   
                  @@ -1443,9 +1422,6 @@ "Unmatched ) or \)"

                  		   
                  @@ -1463,9 +1439,6 @@ "Empty expression"

                  		   
                  @@ -1483,9 +1456,6 @@ "Unknown error"

                  		   
                @@ -1775,7 +1745,7 @@
              -
              Copyright © 1998 -2010 John Maddock

              +

              Copyright © 1998-2010 John Maddock

              Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

              diff --git a/doc/html/boost_regex/background_information/performance.html b/doc/html/boost_regex/background_information/performance.html index 1f9c477f..32e221f5 100644 --- a/doc/html/boost_regex/background_information/performance.html +++ b/doc/html/boost_regex/background_information/performance.html @@ -3,7 +3,7 @@ Performance - + @@ -22,7 +22,7 @@
              PrevUpHomeNext
              -
              +
              @@ -33,12 +33,12 @@ synchronisation), but not by much. The following pages compare Boost.Regex with various other regular expression libraries for the following compilers:

              -
                -
              • +
                -
                Copyright © 1998 -2010 John Maddock

                +

                Copyright © 1998-2010 John Maddock

                Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                diff --git a/doc/html/boost_regex/background_information/redist.html b/doc/html/boost_regex/background_information/redist.html index f4969a0e..7bdb4211 100644 --- a/doc/html/boost_regex/background_information/redist.html +++ b/doc/html/boost_regex/background_information/redist.html @@ -3,7 +3,7 @@ Redistributables - + @@ -22,7 +22,7 @@
                PrevUpHomeNext
                -
                +
                @@ -47,7 +47,7 @@
                -
                Copyright © 1998 -2010 John Maddock

                +

                Copyright © 1998-2010 John Maddock

                Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                diff --git a/doc/html/boost_regex/background_information/standards.html b/doc/html/boost_regex/background_information/standards.html index 6dcbf80d..de1dd9bb 100644 --- a/doc/html/boost_regex/background_information/standards.html +++ b/doc/html/boost_regex/background_information/standards.html @@ -3,7 +3,7 @@ Standards Conformance - + @@ -22,13 +22,13 @@
                PrevUpHomeNext
                -
                +
                - + C++

                @@ -36,7 +36,7 @@ Report on C++ Library Extensions.

                - + ECMAScript / JavaScript
                @@ -49,7 +49,7 @@ rather than a Unicode escape sequence; use \x{DDDD} for Unicode escape sequences.

                - + Perl

                @@ -73,7 +73,7 @@ the Unicode requirements below.

                - + POSIX

                @@ -93,7 +93,7 @@ a custom traits class.

                - + Unicode

                @@ -560,7 +560,7 @@

                -
                Copyright © 1998 -2010 John Maddock

                +

                Copyright © 1998-2010 John Maddock

                Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                diff --git a/doc/html/boost_regex/background_information/thread_safety.html b/doc/html/boost_regex/background_information/thread_safety.html index 95197303..3c462951 100644 --- a/doc/html/boost_regex/background_information/thread_safety.html +++ b/doc/html/boost_regex/background_information/thread_safety.html @@ -3,7 +3,7 @@ Thread Safety - + @@ -22,7 +22,7 @@
                PrevUpHomeNext
                -
                +

                Thread Safety @@ -71,7 +71,7 @@

                -
                Copyright © 1998 -2010 John Maddock

                +

                Copyright © 1998-2010 John Maddock

                Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                diff --git a/doc/html/boost_regex/captures.html b/doc/html/boost_regex/captures.html index 6b3ff537..b03c0cbf 100644 --- a/doc/html/boost_regex/captures.html +++ b/doc/html/boost_regex/captures.html @@ -3,7 +3,7 @@ Understanding Marked Sub-Expressions and Captures - + @@ -22,7 +22,7 @@
                PrevUpHomeNext
                -
                +

                Understanding Marked Sub-Expressions and Captures @@ -35,7 +35,7 @@ accessed.

                - + Marked sub-expressions

                @@ -218,7 +218,7 @@ output stream.

                - + Unmatched Sub-Expressions

                @@ -231,7 +231,7 @@ you can determine which sub-expressions matched by accessing the sub_match::matched data member.

                - + Repeated Captures

                @@ -355,13 +355,13 @@ Text: "now is the time for all good men to come to the aid of the party" don't use it), and a much bigger impact if you do use it, therefore to use this feature you need to:

                -
                  -
                • +
                    +
                  • Define BOOST_REGEX_MATCH_EXTRA for all translation units including the library source (the best way to do this is to uncomment this define in boost/regex/user.hpp and then rebuild everything.
                    • -
                  • +
                  • Pass the match_extra flag to the particular algorithms where you actually need the captures information (regex_search, regex_match, or regex_iterator).
                    • @@ -369,7 +369,7 @@ Text: "now is the time for all good men to come to the aid of the party"
                  -
                  Copyright © 1998 -2010 John Maddock

                  +

                  Copyright © 1998-2010 John Maddock

                  Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                  diff --git a/doc/html/boost_regex/configuration.html b/doc/html/boost_regex/configuration.html index 904f1e65..276db85f 100644 --- a/doc/html/boost_regex/configuration.html +++ b/doc/html/boost_regex/configuration.html @@ -3,7 +3,7 @@ Configuration - + @@ -22,7 +22,7 @@
                  PrevUpHomeNext
                  -
                  +
                  @@ -37,7 +37,7 @@
                  -
                  Copyright © 1998 -2010 John Maddock

                  +

                  Copyright © 1998-2010 John Maddock

                  Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                  diff --git a/doc/html/boost_regex/configuration/algorithm.html b/doc/html/boost_regex/configuration/algorithm.html index b87e656a..906679af 100644 --- a/doc/html/boost_regex/configuration/algorithm.html +++ b/doc/html/boost_regex/configuration/algorithm.html @@ -3,7 +3,7 @@ Algorithm Selection - + @@ -22,7 +22,7 @@
                  PrevUpHomeNext
                  -
                  +
                  @@ -79,7 +79,7 @@
                  -
                  Copyright © 1998 -2010 John Maddock

                  +

                  Copyright © 1998-2010 John Maddock

                  Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                  diff --git a/doc/html/boost_regex/configuration/compiler.html b/doc/html/boost_regex/configuration/compiler.html index 8e1adc09..8cc81e08 100644 --- a/doc/html/boost_regex/configuration/compiler.html +++ b/doc/html/boost_regex/configuration/compiler.html @@ -3,7 +3,7 @@ Compiler Setup - + @@ -22,7 +22,7 @@
                  PrevUpHomeNext
                  -
                  +
                  @@ -36,7 +36,7 @@
                  -
                  Copyright © 1998 -2010 John Maddock

                  +

                  Copyright © 1998-2010 John Maddock

                  Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                  diff --git a/doc/html/boost_regex/configuration/linkage.html b/doc/html/boost_regex/configuration/linkage.html index 396a5885..44ec8fb4 100644 --- a/doc/html/boost_regex/configuration/linkage.html +++ b/doc/html/boost_regex/configuration/linkage.html @@ -3,7 +3,7 @@ Linkage Options - + @@ -22,7 +22,7 @@
                  PrevUpHomeNext
                  -
                  +
                  @@ -77,7 +77,7 @@
                  -
                  Copyright © 1998 -2010 John Maddock

                  +

                  Copyright © 1998-2010 John Maddock

                  Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                  diff --git a/doc/html/boost_regex/configuration/locale.html b/doc/html/boost_regex/configuration/locale.html index 6cc9cefa..4d872aba 100644 --- a/doc/html/boost_regex/configuration/locale.html +++ b/doc/html/boost_regex/configuration/locale.html @@ -3,7 +3,7 @@ Locale and traits class selection - + @@ -22,7 +22,7 @@
                  PrevUpHomeNext
                  -
                  +
                  -
                  Copyright © 1998 -2010 John Maddock

                  +

                  Copyright © 1998-2010 John Maddock

                  Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                  diff --git a/doc/html/boost_regex/configuration/tuning.html b/doc/html/boost_regex/configuration/tuning.html index e65db0b6..85673291 100644 --- a/doc/html/boost_regex/configuration/tuning.html +++ b/doc/html/boost_regex/configuration/tuning.html @@ -3,7 +3,7 @@ Algorithm Tuning - + @@ -22,7 +22,7 @@
                  PrevUpHomeNext
                  -
                  +
                  @@ -142,7 +142,7 @@
                  -
                  Copyright © 1998 -2010 John Maddock

                  +

                  Copyright © 1998-2010 John Maddock

                  Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                  diff --git a/doc/html/boost_regex/format.html b/doc/html/boost_regex/format.html index 29b13779..56005bf0 100644 --- a/doc/html/boost_regex/format.html +++ b/doc/html/boost_regex/format.html @@ -3,7 +3,7 @@ Search and Replace Format String Syntax - + @@ -22,7 +22,7 @@
                  PrevUpHomeNext
                  -
                  +
                  @@ -48,7 +48,7 @@
                  -
                  Copyright © 1998 -2010 John Maddock

                  +

                  Copyright © 1998-2010 John Maddock

                  Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                  diff --git a/doc/html/boost_regex/format/boost_format_syntax.html b/doc/html/boost_regex/format/boost_format_syntax.html index a52920a1..3c639ecf 100644 --- a/doc/html/boost_regex/format/boost_format_syntax.html +++ b/doc/html/boost_regex/format/boost_format_syntax.html @@ -3,7 +3,7 @@ Boost-Extended Format String Syntax - + @@ -22,7 +22,7 @@
                  PrevUpHomeNext
                  -
                  +

                  Boost-Extended Format String Syntax @@ -32,7 +32,7 @@ '$', '\', '(', ')', '?', and ':'.

                  - + Grouping

                  @@ -40,7 +40,7 @@ you want a to output literal parenthesis.

                  - + Conditionals

                  @@ -79,7 +79,7 @@ ?{NAME}true-expression:false-expression

                  - + Placeholder Sequences
                  @@ -319,7 +319,7 @@ as a literal.

                  - + Escape Sequences
                  @@ -547,7 +547,7 @@
                  -
                  Copyright © 1998 -2010 John Maddock

                  +

                  Copyright © 1998-2010 John Maddock

                  Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                  diff --git a/doc/html/boost_regex/format/perl_format.html b/doc/html/boost_regex/format/perl_format.html index ec6920fb..233e0c2b 100644 --- a/doc/html/boost_regex/format/perl_format.html +++ b/doc/html/boost_regex/format/perl_format.html @@ -3,7 +3,7 @@ Perl Format String Syntax - + @@ -22,7 +22,7 @@
                  PrevUpHomeNext
                  -
                  +
                  @@ -489,7 +489,7 @@
                  -
                  Copyright © 1998 -2010 John Maddock

                  +

                  Copyright © 1998-2010 John Maddock

                  Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                  diff --git a/doc/html/boost_regex/format/sed_format.html b/doc/html/boost_regex/format/sed_format.html index fb98f7b2..7a37b2b0 100644 --- a/doc/html/boost_regex/format/sed_format.html +++ b/doc/html/boost_regex/format/sed_format.html @@ -3,7 +3,7 @@ Sed Format String Syntax - + @@ -22,7 +22,7 @@
                  PrevUpHomeNext
                  -
                  +
                  @@ -235,7 +235,7 @@
                  -
                  Copyright © 1998 -2010 John Maddock

                  +

                  Copyright © 1998-2010 John Maddock

                  Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                  diff --git a/doc/html/boost_regex/install.html b/doc/html/boost_regex/install.html index 145fab5a..ffc68c9f 100644 --- a/doc/html/boost_regex/install.html +++ b/doc/html/boost_regex/install.html @@ -3,7 +3,7 @@ Building and Installing the Library - + @@ -22,7 +22,7 @@
                  PrevUpHomeNext
                  -
                  +
                  @@ -49,7 +49,7 @@ file before you can use it, instructions for specific platforms are as follows:

                  - + Building with bjam

                  @@ -58,7 +58,7 @@ started guide for more information.

                  - + Building With Unicode and ICU Support
                  @@ -111,9 +111,8 @@ the library rather than the default ICU binary names.

                  - You might also need to use the options "cxxflags-option" - and "linkflags-option" to set compiler and linker specific - options. + You might also need to use the options "cxxflags=-option" and "linkflags=-option" + to set compiler and linker specific options.

                  @@ -158,22 +157,22 @@ header-include and linker-search paths).

                  - + Building via makefiles
                  - + Borland C++ Builder:
                  -
                    -
                  • +
                      +
                    • Open up a console window and change to the <boost>\libs\regex\build directory.
                      • -
                    • +
                    • Select the appropriate makefile (bcb4.mak for C++ Builder 4, bcb5.mak for C++ Builder 5, and bcb6.mak for C++ Builder 6).
                      • -
                    • +
                    • Invoke the makefile (pass the full path to your version of make if you have more than one version installed, the makefile relies on the path to make to obtain your C++ Builder installation directory and tools) for example: @@ -227,7 +226,7 @@ a lot in compile times!

                      - + Microsoft Visual C++ 6, 7, 7.1 and 8
                      @@ -285,8 +284,8 @@ There are several important caveats to remember when using Boost.Regex with Microsoft's Compiler:

                      -
                        -
                      • +
                          +
                        • There have been some reports of compiler-optimization bugs affecting this library, (particularly with VC6 versions prior to service patch 5) the workaround is to build the library using /Oityb1 rather than /O2. That @@ -296,26 +295,26 @@ so it's probably worthwhile applying this workaround in normal practice in any case.
                          • -
                        • +
                        • If you have replaced the C++ standard library that comes with VC6, then when you build the library you must ensure that the environment variables "INCLUDE" and "LIB" have been updated to reflect the include and library paths for the new library - see vcvars32.bat (part of your Visual Studio installation) for more details.
                          • -
                        • +
                        • If you are building with the full STLPort v4.x, then use the vc6-stlport.mak file provided and set the environment variable STLPORT_PATH to point to the location of your STLPort installation (Note that the full STLPort libraries appear not to support single-thread static builds).
                          • -
                        • +
                        • If you are building your application with /Zc:wchar_t then you will need to modify the makefile to add /Zc:wchar_t before building the library.
                        - + GCC(2.95 and later)

                        @@ -364,7 +363,7 @@ see the config library documentation.

                        - + Sun Workshop 6.1

                        @@ -404,12 +403,12 @@ This makefile does not set any architecture specific options like -xarch=v9, you can set these by defining the appropriate macros, for example:

                        -
                        dmake CXXFLAGS="-xarchv9" LDFLAGS"-xarchv9" LIBSUFFIX"_v9" -f sunpro.mak
                        +
                        dmake CXXFLAGS="-xarch=v9" LDFLAGS="-xarch=v9" LIBSUFFIX="_v9" -f sunpro.mak

                        will build v9 variants of the regex library named libboost_regex_v9.a etc.

                        - + Makefiles for Other compilers
                        @@ -420,7 +419,7 @@
                  -
                  Copyright © 1998 -2010 John Maddock

                  +

                  Copyright © 1998-2010 John Maddock

                  Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                  diff --git a/doc/html/boost_regex/introduction_and_overview.html b/doc/html/boost_regex/introduction_and_overview.html index 0691c0ea..b8e7f043 100644 --- a/doc/html/boost_regex/introduction_and_overview.html +++ b/doc/html/boost_regex/introduction_and_overview.html @@ -3,7 +3,7 @@ Introduction and Overview - + @@ -22,7 +22,7 @@
                  PrevUpHomeNext
                  -
                  +

                  Introduction and Overview @@ -113,8 +113,8 @@ and replace operation is performed with the algorithm regex_replace, for our credit card example we can write two algorithms like this to provide the format conversions:

                  -
                  // match any format with the regular expression:
-const boost::regex e("\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z");
+
                  // match any format with the regular expression:
+const boost::regex e("\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z");
 const std::string machine_format("\\1\\2\\3\\4");
 const std::string human_format("\\1-\\2-\\3-\\4");
 
@@ -201,7 +201,7 @@

                  -
                  Copyright © 1998 -2010 John Maddock

                  +

                  Copyright © 1998-2010 John Maddock

                  Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                  diff --git a/doc/html/boost_regex/partial_matches.html b/doc/html/boost_regex/partial_matches.html index ea0a9a3c..7c636510 100644 --- a/doc/html/boost_regex/partial_matches.html +++ b/doc/html/boost_regex/partial_matches.html @@ -3,7 +3,7 @@ Partial Matches - + @@ -22,7 +22,7 @@
                  PrevUpHomeNext
                  -
                  +
                  @@ -164,14 +164,14 @@ Be aware that using partial matches can sometimes result in somewhat imperfect behavior:

                  -
                    -
                  • +
                      +
                    • There are some expressions, such as ".*abc" that will always produce a partial match. This problem can be reduced by careful construction of the regular expressions used, or by setting flags like match_not_dot_newline so that expressions like .* can't match past line boundaries.
                      • -
                    • +
                    • Boost.Regex currently prefers leftmost matches to full matches, so for example matching "abc|b" against "ab" produces a partial match against the "ab" rather than a full match against "b". @@ -198,24 +198,24 @@ bool is_possible_card_number(const std::string& input) { - // - // return false for partial match, true for full match, or throw for - // impossible match based on what we have so far... - boost::match_results<std::string::const_iterator> what; + // + // return false for partial match, true for full match, or throw for + // impossible match based on what we have so far... + boost::match_results<std::string::const_iterator> what; if(0 == boost::regex_match(input, what, e, boost::match_default | boost::match_partial)) { - // the input so far could not possibly be valid so reject it: - throw std::runtime_error( + // the input so far could not possibly be valid so reject it: + throw std::runtime_error( "Invalid data entered - this could not possibly be a valid card number"); } - // OK so far so good, but have we finished? - if(what[0].matched) + // OK so far so good, but have we finished? + if(what[0].matched) { - // excellent, we have a result: - return true; + // excellent, we have a result: + return true; } - // what we have so far is only a partial match... - return false; + // what we have so far is only a partial match... + return false; }

                      @@ -231,37 +231,37 @@ #include <string> #include <boost/regex.hpp> -// match some kind of html tag: -boost::regex e("<[^>]*>"); -// count how many: -unsigned int tags = 0; +// match some kind of html tag: +boost::regex e("<[^>]*>"); +// count how many: +unsigned int tags = 0; void search(std::istream& is) { - // buffer we'll be searching in: - char buf[4096]; - // saved position of end of partial match: - const char* next_pos = buf + sizeof(buf); - // flag to indicate whether there is more input to come: - bool have_more = true; + // buffer we'll be searching in: + char buf[4096]; + // saved position of end of partial match: + const char* next_pos = buf + sizeof(buf); + // flag to indicate whether there is more input to come: + bool have_more = true; while(have_more) { - // how much do we copy forward from last try: - unsigned leftover = (buf + sizeof(buf)) - next_pos; - // and how much is left to fill: - unsigned size = next_pos - buf; - // copy forward whatever we have left: - std::memmove(buf, next_pos, leftover); - // fill the rest from the stream: - is.read(buf + leftover, size); + // how much do we copy forward from last try: + unsigned leftover = (buf + sizeof(buf)) - next_pos; + // and how much is left to fill: + unsigned size = next_pos - buf; + // copy forward whatever we have left: + std::memmove(buf, next_pos, leftover); + // fill the rest from the stream: + is.read(buf + leftover, size); unsigned read = is.gcount(); - // check to see if we've run out of text: - have_more = read == size; - // reset next_pos: - next_pos = buf + sizeof(buf); - // and then iterate: - boost::cregex_iterator a( + // check to see if we've run out of text: + have_more = read == size; + // reset next_pos: + next_pos = buf + sizeof(buf); + // and then iterate: + boost::cregex_iterator a( buf, buf + read + leftover, e, @@ -272,18 +272,18 @@ { if((*a)[0].matched == false) { - // Partial match, save position and break: - next_pos = (*a)[0].first; + // Partial match, save position and break: + next_pos = (*a)[0].first; break; } else { - // full match: - ++tags; + // full match: + ++tags; } - // move to next match: - ++a; + // move to next match: + ++a; } } } @@ -291,7 +291,7 @@

                    -
                    Copyright © 1998 -2010 John Maddock

                    +

                    Copyright © 1998-2010 John Maddock

                    Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                    diff --git a/doc/html/boost_regex/ref.html b/doc/html/boost_regex/ref.html index b85609fa..c2d9acb7 100644 --- a/doc/html/boost_regex/ref.html +++ b/doc/html/boost_regex/ref.html @@ -3,7 +3,7 @@ Reference - + @@ -22,7 +22,7 @@
                    PrevUpHomeNext
                    -
                    +
                    @@ -104,11 +104,14 @@
                    High Level Class RegEx (Deprecated)
                    +
                    Internal Details
                    +
                    Unicode + Iterators
                    -
                    Copyright © 1998 -2010 John Maddock

                    +

                    Copyright © 1998-2010 John Maddock

                    Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                    diff --git a/doc/html/boost_regex/ref/bad_expression.html b/doc/html/boost_regex/ref/bad_expression.html index 717f348f..dd78f982 100644 --- a/doc/html/boost_regex/ref/bad_expression.html +++ b/doc/html/boost_regex/ref/bad_expression.html @@ -3,7 +3,7 @@ bad_expression - + @@ -22,12 +22,12 @@
                    PrevUpHomeNext
                    -
                    +
                    - + Synopsis 
                    #include <boost/pattern_except.hpp>
@@ -48,13 +48,13 @@
    std::ptrdiff_t position()const;
 };
 
-typedef regex_error bad_pattern; // for backwards compatibility
-typedef regex_error bad_expression; // for backwards compatibility
-
-} // namespace boost
-
                    +typedef regex_error bad_pattern; // for backwards compatibility +typedef regex_error bad_expression; // for backwards compatibility + +} // namespace boost +
                    - + Description 
                    regex_error(const std::string& s, regex_constants::error_type err, std::ptrdiff_t pos);
@@ -89,7 +89,7 @@
                    -
                    Copyright © 1998 -2010 John Maddock

                    +

                    Copyright © 1998-2010 John Maddock

                    Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

                    diff --git a/doc/html/boost_regex/ref/basic_regex.html b/doc/html/boost_regex/ref/basic_regex.html index 0fb676d5..62f62197 100644 --- a/doc/html/boost_regex/ref/basic_regex.html +++ b/doc/html/boost_regex/ref/basic_regex.html @@ -3,7 +3,7 @@ basic_regex - + @@ -22,12 +22,12 @@
                    PrevUpHomeNext
                    -
                    +
                    - + Synopsis 
                    #include <boost/regex.hpp>
@@ -37,14 +37,14 @@
         encapsulates regular expression parsing and compilation. The class takes
         two template parameters:
       
                    
-
                    +} // namespace boost +
                    - + Description

                    Class basic_regex has the following public members:

                    -
                    // main option selection:
-static const regex_constants:: syntax_option_type normal           
+
                    // main option selection:
+static const regex_constants:: syntax_option_type normal           
                                           = regex_constants::normal;
 static const regex_constants:: syntax_option_type ECMAScript       
                                           = normal;
@@ -277,8 +277,8 @@
 static const regex_constants:: syntax_option_type literal          
                                           = regex_constants::literal;
 
-// modifiers specific to perl expressions:
-static const regex_constants:: syntax_option_type no_mod_m         
+// modifiers specific to perl expressions:
+static const regex_constants:: syntax_option_type no_mod_m         
                                           = regex_constants::no_mod_m;
 static const regex_constants:: syntax_option_type no_mod_s         
                                           = regex_constants::no_mod_s;
@@ -287,8 +287,8 @@
 static const regex_constants:: syntax_option_type mod_x            
                                           = regex_constants::mod_x;
 
-// modifiers specific to POSIX basic expressions:
-static const regex_constants:: syntax_option_type bk_plus_qm       
+// modifiers specific to POSIX basic expressions:
+static const regex_constants:: syntax_option_type bk_plus_qm       
                                           = regex_constants::bk_plus_qm;
 static const regex_constants:: syntax_option_type bk_vbar          
                                           = regex_constants::bk_vbar
@@ -297,8 +297,8 @@
 static const regex_constants:: syntax_option_type no_intervals     
                                           = regex_constants::no_intervals
 
-// common modifiers:
-static const regex_constants:: syntax_option_type nosubs           
+// common modifiers:
+static const regex_constants:: syntax_option_type nosubs           
                                           = regex_constants::nosubs;
 static const regex_constants:: syntax_option_type optimize         
                                           = regex_constants::optimize;
@@ -325,7 +325,7 @@
         basic_regex.
       
                    
 
                    
-
                    Table 1. basic_regex default construction postconditions
                    
+
                    Table 1. basic_regex default construction postconditions
                    
 
                    @@ -403,7 +403,7 @@
         flags specified in f.
       
                    
-
                    Table 2. Postconditions for basic_regex construction
                    
+
                    Table 2. Postconditions for basic_regex construction
                    
 
                    
 
 

 
                    @@ -506,7 +506,7 @@
         specified in f.
       
                    
-
                    Table 3. Postconditions for basic_regex construction
                    
+
                    Table 3. Postconditions for basic_regex construction
                    
 
                    
 
 

 
                    @@ -608,7 +608,7 @@
         according the option flags specified in f.
       
                    
-
                    Table 4. Postconditions for basic_regex construction
                    
+
                    Table 4. Postconditions for basic_regex construction
                    
 
                    
 
 

 
                    @@ -716,7 +716,7 @@
         flags specified in f.
       
                    
-
                    Table 5. Postconditions for basic_regex construction
                    
+
                    Table 5. Postconditions for basic_regex construction
                    
 
                    
 
 

 
                    @@ -816,7 +816,7 @@
         flags specified in f.
       
                    
-
                    Table 6. Postconditions for basic_regex construction
                    
+
                    Table 6. Postconditions for basic_regex construction
                    
 
                    
 
 

 
                    @@ -1002,7 +1002,7 @@
         in f.
       
                    
-
                    Table 7. Postconditions for basic_regex::assign
                    
+
                    Table 7. Postconditions for basic_regex::assign
                    
 
                    
 
 

 
                    @@ -1246,7 +1246,7 @@
 
                    
 
 

 
                    
-
                    
 
                    Copyright © 1998 -2010 John Maddock
                    
+
                    Copyright © 1998-2010 John Maddock
                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                    
diff --git a/doc/html/boost_regex/ref/concepts.html b/doc/html/boost_regex/ref/concepts.html
index 1c984f05..353228cf 100644
--- a/doc/html/boost_regex/ref/concepts.html
+++ b/doc/html/boost_regex/ref/concepts.html
@@ -3,7 +3,7 @@
 
 Concepts
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                    
 PrevUpHomeNext
 
                    
-
                    
+
                    
 
                    
@@ -36,7 +36,7 @@
 
                    
 
-
                    
 
                    Copyright © 1998 -2010 John Maddock
                    
+
                    Copyright © 1998-2010 John Maddock
                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                    
diff --git a/doc/html/boost_regex/ref/concepts/charT_concept.html b/doc/html/boost_regex/ref/concepts/charT_concept.html
index 83f77157..01ba8b0d 100644
--- a/doc/html/boost_regex/ref/concepts/charT_concept.html
+++ b/doc/html/boost_regex/ref/concepts/charT_concept.html
@@ -3,7 +3,7 @@
 
 charT Requirements
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                    
 PrevUpHomeNext
 
                    
-
                    
+
                    
 
                    
@@ -258,7 +258,7 @@
 
                    
 
-
                    
 
                    Copyright © 1998 -2010 John Maddock
                    
+
                    Copyright © 1998-2010 John Maddock
                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                    
diff --git a/doc/html/boost_regex/ref/concepts/iterator_concepts.html b/doc/html/boost_regex/ref/concepts/iterator_concepts.html
index 3d12a241..5df6aada 100644
--- a/doc/html/boost_regex/ref/concepts/iterator_concepts.html
+++ b/doc/html/boost_regex/ref/concepts/iterator_concepts.html
@@ -3,7 +3,7 @@
 
 Iterator Requirements
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                    
 PrevUpHomeNext
 
                    
-
                    
+
                    
 
                    
 Iterator
         Requirements
@@ -33,7 +33,7 @@
 
                    
 
-
                    
 
                    Copyright © 1998 -2010 John Maddock
                    
+
                    Copyright © 1998-2010 John Maddock
                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                    
diff --git a/doc/html/boost_regex/ref/concepts/traits_concept.html b/doc/html/boost_regex/ref/concepts/traits_concept.html
index b3e1d326..4d11605f 100644
--- a/doc/html/boost_regex/ref/concepts/traits_concept.html
+++ b/doc/html/boost_regex/ref/concepts/traits_concept.html
@@ -3,7 +3,7 @@
 
 Traits Class Requirements
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                    
 PrevUpHomeNext
 
                    
-
                    
+
                    
 
                    
 Traits Class
         Requirements
@@ -34,7 +34,7 @@
           Boost-specific enhanced interface.
         
                    
 
                    
-
+
           Minimal
           requirements.
         
                    
@@ -378,7 +378,7 @@
 
                    
 
                    
 
                    
-
+
           Additional
           Optional Requirements
         
                    
@@ -577,7 +577,7 @@
 
                    
 
-
                    
 
                    Copyright © 1998 -2010 John Maddock
                    
+
                    Copyright © 1998-2010 John Maddock
                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                    
diff --git a/doc/html/boost_regex/ref/deprecated_interfaces.html b/doc/html/boost_regex/ref/deprecated_interfaces.html
index 2ffecf43..ca89754d 100644
--- a/doc/html/boost_regex/ref/deprecated_interfaces.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces.html
@@ -3,7 +3,7 @@
 
 Deprecated Interfaces
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                    
 PrevUpHomeNext
 
                    
-
                    
+
                    
 
                    
@@ -39,7 +39,7 @@
 
                    
 
-
                    
 
                    Copyright © 1998 -2010 John Maddock
                    
+
                    Copyright © 1998-2010 John Maddock
                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                    
diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html b/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html
index 84c4677e..7177bda9 100644
--- a/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html
@@ -3,11 +3,11 @@
 
 High Level Class RegEx (Deprecated)
 
-
+
 
 
 
-
+
 
 
 
@@ -20,9 +20,9 @@
 
                    
 
                    
 
                    
-PrevUpHomeNext
+PrevUpHomeNext
 
                    
-
                    
+
                    
 
                    
 High
         Level Class RegEx (Deprecated)
@@ -59,10 +59,10 @@
    unsigned int SetExpression(const char* p, bool icase = false);
    unsigned int SetExpression(const std::string& s, bool icase = false);
    std::string Expression()const;
-   //
-   // now matching operators: 
-   // 
-   bool Match(const char* p, boost::match_flag_type flags = match_default);
+   //
+   // now matching operators: 
+   // 
+   bool Match(const char* p, boost::match_flag_type flags = match_default);
    bool Match(const std::string& s, boost::match_flag_type flags = match_default); 
    bool Search(const char* p, boost::match_flag_type flags = match_default); 
    bool Search(const std::string& s, boost::match_flag_type flags = match_default); 
@@ -96,10 +96,10 @@
    unsigned Split(std::vector<std::string>& v, std::string& s, 
                   boost::match_flag_type flags = match_default, 
                   unsigned max_count = ~0); 
-   // 
-   // now operators for returning what matched in more detail: 
-   // 
-   unsigned int Position(int i = 0)const; 
+   // 
+   // now operators for returning what matched in more detail: 
+   // 
+   unsigned int Position(int i = 0)const; 
    unsigned int Length(int i = 0)const; 
    bool Matched(int i = 0)const;
    unsigned int Line()const; 
@@ -819,7 +819,7 @@
 
                    
 
-
                    
 
                    Copyright © 1998 -2010 John Maddock
                    
+
                    Copyright © 1998-2010 John Maddock
                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                    
@@ -827,7 +827,7 @@
 
                    
 
                    
 
                    
-PrevUpHomeNext
+PrevUpHomeNext
 
                    
 
 
diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html b/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
index 64346cec..b7bb39ac 100644
--- a/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
@@ -3,7 +3,7 @@
 
 regex_format (Deprecated)
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                    
 PrevUpHomeNext
 
                    
-
                    
+
                    
 
                    
 regex_format
         (Deprecated)
@@ -34,7 +34,7 @@
           previous version of Boost.Regex and will not be further updated:
         
                    
 
                    
-
+
           Algorithm
           regex_format
         
                    
@@ -159,7 +159,7 @@
 
                    
 
-
                    
 
                    Copyright © 1998 -2010 John Maddock
                    
+
                    Copyright © 1998-2010 John Maddock
                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                    
diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html b/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html
index a6ede4d4..eb297b54 100644
--- a/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html
@@ -3,7 +3,7 @@
 
 regex_grep (Deprecated)
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                    
 PrevUpHomeNext
 
                    
-
                    
+
                    
 
                    
 regex_grep
         (Deprecated)
@@ -135,33 +135,33 @@
 #include <map> 
 #include <boost/regex.hpp> 
 
-// IndexClasses: 
-// takes the contents of a file in the form of a string 
-// and searches for all the C++ class definitions, storing 
-// their locations in a map of strings/int's 
-typedef std::map<std::string, int, std::less<std::string> > map_type; 
+// IndexClasses: 
+// takes the contents of a file in the form of a string 
+// and searches for all the C++ class definitions, storing 
+// their locations in a map of strings/int's 
+typedef std::map<std::string, int, std::less<std::string> > map_type; 
 
 const char* re = 
-   // possibly leading whitespace:   
-   "^[[:space:]]*" 
-   // possible template declaration:
-   "(template[[:space:]]*<[^;:{]+>[[:space:]]*)?"
-   // class or struct:
-   "(class|struct)[[:space:]]*" 
-   // leading declspec macros etc:
-   "("
+   // possibly leading whitespace:   
+   "^[[:space:]]*" 
+   // possible template declaration:
+   "(template[[:space:]]*<[^;:{]+>[[:space:]]*)?"
+   // class or struct:
+   "(class|struct)[[:space:]]*" 
+   // leading declspec macros etc:
+   "("
       "\\<\\w+\\>"
       "("
          "[[:blank:]]*\\([^)]*\\)"
       ")?"
       "[[:space:]]*"
    ")*" 
-   // the class name
-   "(\\<\\w*\\>)[[:space:]]*" 
-   // template specialisation parameters
-   "(<[^;:{]+>)?[[:space:]]*"
-   // terminate in { or :
-   "(\\{|:[^;\\{()]*\\{)";
+   // the class name
+   "(\\<\\w*\\>)[[:space:]]*" 
+   // template specialisation parameters
+   "(<[^;:{]+>)?[[:space:]]*"
+   // terminate in { or :
+   "(\\{|:[^;\\{()]*\\{)";
 
 boost::regex expression(re); 
 class IndexClassesPred 
@@ -172,11 +172,11 @@
    IndexClassesPred(map_type& a, std::string::const_iterator b) : m(a), base(b) {} 
    bool operator()(const  smatch& what) 
    { 
-      // what[0] contains the whole string 
-      // what[5] contains the class name. 
-      // what[6] contains the template specialisation if any. 
-      // add class name and position to map: 
-      m[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
+      // what[0] contains the whole string 
+      // what[5] contains the class name. 
+      // what[6] contains the template specialisation if any. 
+      // add class name and position to map: 
+      m[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
                what[5].first - base; 
       return true; 
    } 
@@ -197,33 +197,33 @@
 #include <map> 
 #include <boost/regex.hpp> 
 
-// purpose: 
-// takes the contents of a file in the form of a string 
-// and searches for all the C++ class definitions, storing 
-// their locations in a map of strings/int's 
-typedef std::map<std::string, int, std::less<std::string> > map_type; 
+// purpose: 
+// takes the contents of a file in the form of a string 
+// and searches for all the C++ class definitions, storing 
+// their locations in a map of strings/int's 
+typedef std::map<std::string, int, std::less<std::string> > map_type; 
 
 const char* re = 
-   // possibly leading whitespace:   
-   "^[[:space:]]*" 
-   // possible template declaration:
-   "(template[[:space:]]*<[^;:{]+>[[:space:]]*)?"
-   // class or struct:
-   "(class|struct)[[:space:]]*" 
-   // leading declspec macros etc:
-   "("
+   // possibly leading whitespace:   
+   "^[[:space:]]*" 
+   // possible template declaration:
+   "(template[[:space:]]*<[^;:{]+>[[:space:]]*)?"
+   // class or struct:
+   "(class|struct)[[:space:]]*" 
+   // leading declspec macros etc:
+   "("
       "\\<\\w+\\>"
       "("
          "[[:blank:]]*\\([^)]*\\)"
       ")?"
       "[[:space:]]*"
    ")*" 
-   // the class name
-   "(\\<\\w*\\>)[[:space:]]*" 
-   // template specialisation parameters
-   "(<[^;:{]+>)?[[:space:]]*"
-   // terminate in { or :
-   "(\\{|:[^;\\{()]*\\{)";
+   // the class name
+   "(\\<\\w*\\>)[[:space:]]*" 
+   // template specialisation parameters
+   "(<[^;:{]+>)?[[:space:]]*"
+   // terminate in { or :
+   "(\\{|:[^;\\{()]*\\{)";
 
 boost::regex expression(re);
 map_type class_index; 
@@ -231,11 +231,11 @@
 
 bool grep_callback(const  boost::smatch& what) 
 { 
-   // what[0] contains the whole string 
-   // what[5] contains the class name. 
-   // what[6] contains the template specialisation if any. 
-   // add class name and position to map: 
-   class_index[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
+   // what[0] contains the whole string 
+   // what[5] contains the class name. 
+   // what[6] contains the template specialisation if any. 
+   // add class name and position to map: 
+   class_index[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
                what[5].first - base; 
    return true; 
 } 
@@ -257,11 +257,11 @@
 #include <map> 
 #include <boost/regex.hpp> 
 #include <functional> 
-// purpose: 
-// takes the contents of a file in the form of a string 
-// and searches for all the C++ class definitions, storing 
-// their locations in a map of strings/int's 
-
+// purpose: 
+// takes the contents of a file in the form of a string 
+// and searches for all the C++ class definitions, storing 
+// their locations in a map of strings/int's 
+
 typedef std::map<std::string, int, std::less<std::string> > map_type; 
 class class_index 
 { 
@@ -281,11 +281,11 @@
 }; 
 bool  class_index::grep_callback(boost::smatch what) 
 { 
-   // what[0] contains the whole string 
-   // what[5] contains the class name. 
-   // what[6] contains the template specialisation if any. 
-   // add class name and position to map: 
-   index[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
+   // what[0] contains the whole string 
+   // what[5] contains the class name. 
+   // what[6] contains the template specialisation if any. 
+   // add class name and position to map: 
+   index[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
                what[5].first - base; 
    return true; 
 } 
@@ -310,11 +310,11 @@
 #include <map> 
 #include <boost/regex.hpp> 
 #include <functional> 
-// purpose: 
-// takes the contents of a file in the form of a string 
-// and searches for all the C++ class definitions, storing 
-// their locations in a map of strings/int's 
-
+// purpose: 
+// takes the contents of a file in the form of a string 
+// and searches for all the C++ class definitions, storing 
+// their locations in a map of strings/int's 
+
 typedef std::map<std::string, int, std::less<std::string> > map_type; 
 class class_index 
 { 
@@ -337,11 +337,11 @@
 
 bool class_index::grep_callback(const arg_type& what) 
 { 
-   // what[0] contains the whole string    
-// what[5] contains the class name.    
-// what[6] contains the template specialisation if any.    
-// add class name and position to map:    
-index[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
+   // what[0] contains the whole string    
+// what[5] contains the class name.    
+// what[6] contains the template specialisation if any.    
+// add class name and position to map:    
+index[std::string(what[5].first, what[5].second) + std::string(what[6].first, what[6].second)] = 
                what[5].first - base; 
    return true; 
 } 
@@ -362,7 +362,7 @@
 
                    
 
-
                    
 
                    Copyright © 1998 -2010 John Maddock
                    
+
                    Copyright © 1998-2010 John Maddock
                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                    
diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html b/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html
index 48889dae..10089c43 100644
--- a/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html
@@ -3,7 +3,7 @@
 
 regex_split (deprecated)
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                    
 PrevUpHomeNext
 
                    
-
                    
+
                    
 
                    
 regex_split
         (deprecated)
@@ -108,16 +108,16 @@
 void load_file(std::string& s, std::istream& is)
 {
    s.erase();
-   //
-   // attempt to grow string buffer to match file size,
-   // this doesn't always work...
-   s.reserve(is.rdbuf()-&gtin_avail());
+   //
+   // attempt to grow string buffer to match file size,
+   // this doesn't always work...
+   s.reserve(is.rdbuf()-&gtin_avail());
    char c;
    while(is.get(c))
    {
-      // use logarithmic growth stategy, in case
-      // in_avail (above) returned zero:
-      if(s.capacity() == s.size())
+      // use logarithmic growth stategy, in case
+      // in_avail (above) returned zero:
+      if(s.capacity() == s.size())
          s.reserve(s.capacity() * 3);
       s.append(1, c);
    }
@@ -149,7 +149,7 @@
 
                    
 
-
                    
 
                    Copyright © 1998 -2010 John Maddock
                    
+
                    Copyright © 1998-2010 John Maddock
                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                    
diff --git a/doc/html/boost_regex/ref/error_type.html b/doc/html/boost_regex/ref/error_type.html
index 14869041..ea5258f3 100644
--- a/doc/html/boost_regex/ref/error_type.html
+++ b/doc/html/boost_regex/ref/error_type.html
@@ -3,7 +3,7 @@
 
 error_type
 
-
+
 
 
 
@@ -22,12 +22,12 @@
 
                    
 PrevUpHomeNext
 
                    
-
                    
+
                    
 
                    
 
                    
-
+
         Synopsis
       
                    
 
                    
@@ -53,11 +53,11 @@
 static const error_type error_stack;
 static const error_type error_bad_pattern;
 
-} // namespace regex_constants
-} // namespace boost
-
+} // namespace regex_constants
+} // namespace boost
+
 
                    
-
+
         Description
       
                    
 
                    
@@ -257,7 +257,7 @@
 
                    
 
-
                    
 
                    Copyright © 1998 -2010 John Maddock
                    
+
                    Copyright © 1998-2010 John Maddock
                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                    
diff --git a/doc/html/boost_regex/ref/internal_details.html b/doc/html/boost_regex/ref/internal_details.html
new file mode 100644
index 00000000..9192f8e4
--- /dev/null
+++ b/doc/html/boost_regex/ref/internal_details.html
@@ -0,0 +1,45 @@
+
+
+
+Internal Details
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                    Boost C++ LibrariesHomeLibrariesPeopleFAQMore
                    
+
                    
+
                    
+PrevUpHomeNext
+
                    
+
                    
+
                    
+
                    Unicode
+        Iterators
                    
+
                    
+
+
+
+
                    Copyright © 1998-2010 John Maddock
                    
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+      
                    
+
                    
+
                    
+
                    
+PrevUpHomeNext
+
                    
+
+
diff --git a/doc/html/boost_regex/ref/internal_details/uni_iter.html b/doc/html/boost_regex/ref/internal_details/uni_iter.html
new file mode 100644
index 00000000..4f5a29a5
--- /dev/null
+++ b/doc/html/boost_regex/ref/internal_details/uni_iter.html
@@ -0,0 +1,183 @@
+
+
+
+Unicode Iterators
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                    Boost C++ LibrariesHomeLibrariesPeopleFAQMore
                    
+
                    
+
                    
+PrevUpHomeNext
+
                    
+
                    
+
                    
+
                    
+
+          Synopsis
+        
                    
+
                    
+          
+
                    
+
                    #include <boost/regex/pending/unicode_iterator.hpp>
                    
+
                    
+        
                    
+
                    template <class BaseIterator, class U16Type = ::boost::uint16_t>
+class u32_to_u16_iterator;
+
+template <class BaseIterator, class U32Type = ::boost::uint32_t>
+class u16_to_u32_iterator;
+
+template <class BaseIterator, class U8Type = ::boost::uint8_t>
+class u32_to_u8_iterator;
+
+template <class BaseIterator, class U32Type = ::boost::uint32_t>
+class u8_to_u32_iterator;
+
+template <class BaseIterator>
+class utf16_output_iterator;
+
+template <class BaseIterator>
+class utf8_output_iterator;
+
                    
+
                    
+
+          Description
+        
                    
+
                    
+          This header contains a selection of iterator adaptors that make a sequence
+          of characters in one encoding "look like" a read-only sequence
+          of characters in another encoding.
+        
                    
+
                    template <class BaseIterator, class U16Type = ::boost::uint16_t>
+class u32_to_u16_iterator
+{
+   u32_to_u16_iterator();
+   u32_to_u16_iterator(BaseIterator start_position);
+
+   // Other standard BidirectionalIterator members here...
+};
+
                    
+
                    
+          A Bidirectional iterator adapter that makes an underlying sequence of UTF32
+          characters look like a (read-only) sequence of UTF16 characters. The UTF16
+          characters are encoded in the platforms native byte order.
+        
                    
+
                    template <class BaseIterator, class U32Type = ::boost::uint32_t>
+class u16_to_u32_iterator
+{
+   u16_to_u32_iterator();
+   u16_to_u32_iterator(BaseIterator start_position);
+   u16_to_u32_iterator(BaseIterator start_position, BaseIterator start_range, BaseIterator end_range);
+
+   // Other standard BidirectionalIterator members here...
+};
+
                    
+
                    
+          A Bidirectional iterator adapter that makes an underlying sequence of UTF16
+          characters (in the platforms native byte order) look like a (read-only)
+          sequence of UTF32 characters.
+        
                    
+
                    
+          The three-arg constructor of this class takes the start and end of the
+          underlying sequence as well as the position to start iteration from. This
+          constructor validates that the underlying sequence has validly encoded
+          endpoints: this prevents accidently incrementing/decrementing past the
+          end of the underlying sequence as a result of invalid UTF16 code sequences
+          at the endpoints of the underlying range.
+        
                    
+
                    template <class BaseIterator, class U8Type = ::boost::uint8_t>
+class u32_to_u8_iterator
+{
+   u32_to_u8_iterator();
+   u32_to_u8_iterator(BaseIterator start_position);
+
+   // Other standard BidirectionalIterator members here...
+};
+
                    
+
                    
+          A Bidirectional iterator adapter that makes an underlying sequence of UTF32
+          characters look like a (read-only) sequence of UTF8 characters.
+        
                    
+
                    template <class BaseIterator, class U32Type = ::boost::uint32_t>
+class u8_to_u32_iterator
+{
+   u8_to_u32_iterator();
+   u8_to_u32_iterator(BaseIterator start_position);
+   u8_to_u32_iterator(BaseIterator start_position, BaseIterator start_range, BaseIterator end_range);
+
+   // Other standard BidirectionalIterator members here...
+};
+
                    
+
                    
+          A Bidirectional iterator adapter that makes an underlying sequence of UTF8
+          characters look like a (read-only) sequence of UTF32 characters.
+        
                    
+
                    
+          The three-arg constructor of this class takes the start and end of the
+          underlying sequence as well as the position to start iteration from. This
+          constructor validates that the underlying sequence has validly encoded
+          endpoints: this prevents accidently incrementing/decrementing past the
+          end of the underlying sequence as a result of invalid UTF8 code sequences
+          at the endpoints of the underlying range.
+        
                    
+
                    template <class BaseIterator>
+class utf16_output_iterator
+{
+   utf16_output_iterator(const BaseIterator& b);
+   utf16_output_iterator(const utf16_output_iterator& that);
+   utf16_output_iterator& operator=(const utf16_output_iterator& that);
+
+   // Other standard OutputIterator members here...
+};
+
                    
+
                    
+          Simple OutputIterator adapter - accepts UTF32 values as input, and forwards
+          them to BaseIterator b as UTF16. Both UTF32 and UTF16
+          values are in native byte order.
+        
                    
+
                    template <class BaseIterator>
+class utf8_output_iterator
+{
+   utf8_output_iterator(const BaseIterator& b);
+   utf8_output_iterator(const utf8_output_iterator& that);
+   utf8_output_iterator& operator=(const utf8_output_iterator& that);
+
+   // Other standard OutputIterator members here...
+};
+
                    
+
                    
+          Simple OutputIterator adapter - accepts UTF32 values as input, and forwards
+          them to BaseIterator b as UTF8. The UTF32 input values
+          must be in native byte order.
+        
                    
+
                    
+
+
+
+
                    Copyright © 1998-2010 John Maddock
                    
+        Distributed under the Boost Software License, Version 1.0. (See accompanying
+        file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+      
                    
+
                    
+
                    
+
                    
+PrevUpHomeNext
+
                    
+
+
diff --git a/doc/html/boost_regex/ref/match_flag_type.html b/doc/html/boost_regex/ref/match_flag_type.html
index dc9bd64e..4dfdac10 100644
--- a/doc/html/boost_regex/ref/match_flag_type.html
+++ b/doc/html/boost_regex/ref/match_flag_type.html
@@ -3,7 +3,7 @@
 
 match_flag_type
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                    
 PrevUpHomeNext
 
                    
-
                    
+
                    
 
                    
@@ -65,11 +65,11 @@
 static const match_flag_type format_first_only;
 static const match_flag_type format_all;
 
-} // namespace regex_constants
-} // namespace boost
-
+} // namespace regex_constants
+} // namespace boost
+
 
                    
-
+
         Description
       
                    
 
                    
@@ -483,7 +483,7 @@
 
                    
 
-
                    
 
                    Copyright © 1998 -2010 John Maddock
                    
+
                    Copyright © 1998-2010 John Maddock
                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                    
diff --git a/doc/html/boost_regex/ref/match_results.html b/doc/html/boost_regex/ref/match_results.html
index cb60c81a..9ba0d402 100644
--- a/doc/html/boost_regex/ref/match_results.html
+++ b/doc/html/boost_regex/ref/match_results.html
@@ -3,7 +3,7 @@
 
 match_results
 
-
+
 
 
 
@@ -22,12 +22,12 @@
 
                    
 PrevUpHomeNext
 
                    
-
                    
+
                    
 
                    
 
                    
-
+
         Synopsis
       
                    
 
                    #include <boost/regex.hpp>
@@ -86,18 +86,18 @@
    typedef typename iterator_traits<BidirectionalIterator>::value_type      char_type;
    typedef          basic_string<char_type>                                 string_type;
 
-   // construct/copy/destroy:
-   explicit match_results(const Allocator& a = Allocator());
+   // construct/copy/destroy:
+   explicit match_results(const Allocator& a = Allocator());
    match_results(const match_results& m);
    match_results& operator=(const match_results& m); 
    ~match_results();
 
-   // size:
-   size_type size() const;
+   // size:
+   size_type size() const;
    size_type max_size() const;
    bool empty() const;
-   // element access:
-   difference_type length(int sub = 0) const;
+   // element access:
+   difference_type length(int sub = 0) const;
    difference_type length(const char_type* sub) const;
    template <class charT>
    difference_type length(const charT* sub) const;
@@ -131,8 +131,8 @@
    const_reference suffix() const;
    const_iterator begin() const;
    const_iterator end() const;
-   // format:
-   template <class OutputIterator, class Formatter>
+   // format:
+   template <class OutputIterator, class Formatter>
    OutputIterator format(OutputIterator out,
                         Formatter fmt,
                         match_flag_type flags = format_default) const;
@@ -167,7 +167,7 @@
          match_results<BidirectionalIterator, Allocator>& m2);
 
                    
 
                    
-
+
         Description
       
                    
 
                    
@@ -625,16 +625,16 @@
         then depending on the number of arguments the function object accepts, it
         will either:
       
                    
-
                      
-
                    • 
+
                        
+
                      • 
             Call fmt(*this)
             and copy the string returned to OutputIterator
             out.
           
                        • 
-
                      • 
+
                      • 
             Call fmt(*this, out).
           
                        • 
-
                      • 
+
                      • 
             Call fmt(*this, out, flags).
           
                        • 
 
                      
@@ -691,17 +691,17 @@
         then depending on the number of arguments the function object accepts, it
         will either:
       
                      
-
                        
-
                      • 
+
                          
+
                        • 
             Call fmt(*this)
             and return the result.
           
                          • 
-
                        • 
+
                        • 
             Call fmt(*this, unspecified-output-iterator),
             where unspecified-output-iterator is an unspecified OutputIterator
             type used to copy the output to the string result.
           
                          • 
-
                        • 
+
                        • 
             Call fmt(*this, unspecified-output-iterator,
             flags),
             where unspecified-output-iterator is an unspecified OutputIterator
@@ -765,17 +765,17 @@
         Rationale: Enabling this feature has several
         consequences:
       
                          
-
                            
-
                          • 
+
                              
+
                            • 
             sub_match occupies more memory resulting in complex expressions running
             out of memory or stack space more quickly during matching.
           
                              • 
-
                            • 
+
                            • 
             The matching algorithms are less efficient at handling some features
             (independent sub-expressions for example), even when match_extra is not
             used.
           
                              • 
-
                            • 
+
                            • 
             The matching algorithms are much less efficient (i.e. slower), when match_extra
             is used. Mostly this is down to the extra memory allocations that have
             to take place.
@@ -818,7 +818,7 @@
 
                            
 
-
                            
 
                            Copyright © 1998 -2010 John Maddock
                            
+
                            Copyright © 1998-2010 John Maddock
                            
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                            
diff --git a/doc/html/boost_regex/ref/non_std_strings.html b/doc/html/boost_regex/ref/non_std_strings.html
index a3b5c261..830ad6a9 100644
--- a/doc/html/boost_regex/ref/non_std_strings.html
+++ b/doc/html/boost_regex/ref/non_std_strings.html
@@ -3,7 +3,7 @@
 
 Interfacing With Non-Standard String Types
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                            
 PrevUpHomeNext
 
                            
-
                            
+
                            
 
                            
 
-
                            
 
                            Copyright © 1998 -2010 John Maddock
                            
+
                            Copyright © 1998-2010 John Maddock
                            
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                            
diff --git a/doc/html/boost_regex/ref/non_std_strings/icu.html b/doc/html/boost_regex/ref/non_std_strings/icu.html
index 8af69dca..dc74fd51 100644
--- a/doc/html/boost_regex/ref/non_std_strings/icu.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu.html
@@ -3,7 +3,7 @@
 
 Working With Unicode and ICU String Types
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                            
 PrevUpHomeNext
 
                            
-
                            
+
                            
 
                            
 
-
                            
 
                            Copyright © 1998 -2010 John Maddock
                            
+
                            Copyright © 1998-2010 John Maddock
                            
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                            
diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/intro.html b/doc/html/boost_regex/ref/non_std_strings/icu/intro.html
index 121d9194..cc75950b 100644
--- a/doc/html/boost_regex/ref/non_std_strings/icu/intro.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/intro.html
@@ -3,7 +3,7 @@
 
 Introduction to using Regex with ICU
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                            
 PrevUpHomeNext
 
                            
-
                            
+
                            
 
                            
 Introduction
           to using Regex with ICU
@@ -45,16 +45,16 @@
 
                            
             The header will enable you to:
           
                            
-
                              
-
                            • 
+
                                
+
                              • 
                 Create regular expressions that treat Unicode strings as sequences
                 of UTF-32 code points.
               
                                • 
-
                              • 
+
                              • 
                 Create regular expressions that support various Unicode data properties,
                 including character classification.
               
                                • 
-
                              • 
+
                              • 
                 Transparently search Unicode strings that are encoded as either UTF-8,
                 UTF-16 or UTF-32.
               
                                • 
@@ -62,7 +62,7 @@
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html
index e77a9520..9a25cd72 100644
--- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html
@@ -3,7 +3,7 @@
 
 Unicode Regular Expression Algorithms
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
 Unicode
           Regular Expression Algorithms
@@ -43,7 +43,7 @@
             on to the "real" algorithm.
           
                              
 
                              
-
+
             u32regex_match
           
                              
 
                              
@@ -57,11 +57,11 @@
 
                              
             Example: match a password, encoded in a UTF-16 UnicodeString:
           
                              
-
                              //
-// Find out if *password* meets our password requirements,
-// as defined by the regular expression *requirements*.
-//
-bool is_valid_password(const UnicodeString& password, const UnicodeString& requirements)
+
                              //
+// Find out if *password* meets our password requirements,
+// as defined by the regular expression *requirements*.
+//
+bool is_valid_password(const UnicodeString& password, const UnicodeString& requirements)
 {
    return boost::u32regex_match(password, boost::make_u32regex(requirements));
 }
@@ -69,18 +69,18 @@
 
                              
             Example: match a UTF-8 encoded filename:
           
                              
-
                              //
-// Extract filename part of a path from a UTF-8 encoded std::string and return the result
-// as another std::string:
-//
-std::string get_filename(const std::string& path)
+
                              //
+// Extract filename part of a path from a UTF-8 encoded std::string and return the result
+// as another std::string:
+//
+std::string get_filename(const std::string& path)
 {
    boost::u32regex r = boost::make_u32regex("(?:\\A|.*\\\\)([^\\\\]+)");
    boost::smatch what;
    if(boost::u32regex_match(path, what, r))
    {
-      // extract $1 as a std::string:
-      return what.str(1);
+      // extract $1 as a std::string:
+      return what.str(1);
    }
    else
    {
@@ -89,7 +89,7 @@
 }
 
                              
 
                              
-
+
             u32regex_search
           
                              
 
                              
@@ -105,21 +105,21 @@
           
                              
 
                              UnicodeString extract_greek(const UnicodeString& text)
 {
-   // searches through some UTF-16 encoded text for a block encoded in Greek,
-   // this expression is imperfect, but the best we can do for now - searching
-   // for specific scripts is actually pretty hard to do right.
-   //
-   // Here we search for a character sequence that begins with a Greek letter,
-   // and continues with characters that are either not-letters ( [^[:L*:]] )
-   // or are characters in the Greek character block ( [\\x{370}-\\x{3FF}] ).
-   //
-   boost::u32regex r = boost::make_u32regex(
+   // searches through some UTF-16 encoded text for a block encoded in Greek,
+   // this expression is imperfect, but the best we can do for now - searching
+   // for specific scripts is actually pretty hard to do right.
+   //
+   // Here we search for a character sequence that begins with a Greek letter,
+   // and continues with characters that are either not-letters ( [^[:L*:]] )
+   // or are characters in the Greek character block ( [\\x{370}-\\x{3FF}] ).
+   //
+   boost::u32regex r = boost::make_u32regex(
          L"[\\x{370}-\\x{3FF}](?:[^[:L*:]]|[\\x{370}-\\x{3FF}])*");
    boost::u16match what;
    if(boost::u32regex_search(text, what, r))
    {
-      // extract $0 as a UnicodeString:
-      return UnicodeString(what[0].first, what.length(0));
+      // extract $0 as a UnicodeString:
+      return UnicodeString(what[0].first, what.length(0));
    }
    else
    {
@@ -128,7 +128,7 @@
 }
 
                              
 
                              
-
+
             u32regex_replace
           
                              
 
                              
@@ -146,15 +146,15 @@
 
                              
             Example: Credit card number reformatting:
           
                              
-
                              //
-// Take a credit card number as a string of digits, 
-// and reformat it as a human readable string with "-"
-// separating each group of four digit;, 
-// note that we're mixing a UTF-32 regex, with a UTF-16
-// string and a UTF-8 format specifier, and it still all 
-// just works:
-//
-const boost::u32regex e = boost::make_u32regex(
+
                              //
+// Take a credit card number as a string of digits, 
+// and reformat it as a human readable string with "-"
+// separating each group of four digit;, 
+// note that we're mixing a UTF-32 regex, with a UTF-16
+// string and a UTF-8 format specifier, and it still all 
+// just works:
+//
+const boost::u32regex e = boost::make_u32regex(
       "\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z");
 const char* human_format = "$1-$2-$3-$4";
 
@@ -166,7 +166,7 @@
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html
index c0dbd749..cfbd066a 100644
--- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html
@@ -3,7 +3,7 @@
 
 Unicode Aware Regex Iterators
 
-
+
 
 
 
@@ -22,13 +22,13 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
 
                              
-
+
             u32regex_iterator
           
                              
 
                              
@@ -42,8 +42,8 @@
 
                              template <class BidirectionalIterator>
 class u32regex_iterator
 {
-   // for members see regex_iterator
-};
+   // for members see regex_iterator
+};
 
 typedef u32regex_iterator<const char*>     utf8regex_iterator;
 typedef u32regex_iterator<const UChar*>    utf16regex_iterator;
@@ -91,9 +91,9 @@
           
                              
 
                              void enumerate_currencies(const std::string& text)
 {
-   // enumerate and print all the currency symbols, along
-   // with any associated numeric values:
-   const char* re = 
+   // enumerate and print all the currency symbols, along
+   // with any associated numeric values:
+   const char* re = 
       "([[:Sc:]][[:Cf:][:Cc:][:Z*:]]*)?"
       "([[:Nd:]]+(?:[[:Po:]][[:Nd:]]+)?)?"
       "(?(1)"
@@ -126,7 +126,7 @@
             Provided of course that the input is encoded as UTF-8.
           
                              
 
                              
-
+
             u32regex_token_iterator
           
                              
 
                              
@@ -140,8 +140,8 @@
 
                              template <class BidirectionalIterator>
 class u32regex_token_iterator
 {
-   // for members see regex_token_iterator
-};
+   // for members see regex_token_iterator
+};
 
 typedef u32regex_token_iterator<const char*>     utf8regex_token_iterator;
 typedef u32regex_token_iterator<const UChar*>    utf16regex_token_iterator;
@@ -285,9 +285,9 @@
           
                              
 
                              void enumerate_currencies2(const std::string& text)
 {
-   // enumerate and print all the currency symbols, along
-   // with any associated numeric values:
-   const char* re = 
+   // enumerate and print all the currency symbols, along
+   // with any associated numeric values:
+   const char* re = 
       "([[:Sc:]][[:Cf:][:Cc:][:Z*:]]*)?"
       "([[:Nd:]]+(?:[[:Po:]][[:Nd:]]+)?)?"
       "(?(1)"
@@ -309,7 +309,7 @@
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html
index db04a0cc..eea24198 100644
--- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html
@@ -3,7 +3,7 @@
 
 Unicode regular expression types
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
 Unicode
           regular expression types
@@ -118,7 +118,7 @@
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings.html
index f9d304cf..a29f9c63 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings.html
@@ -3,7 +3,7 @@
 
 Using Boost Regex With MFC Strings
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html
index 106400c1..b36f6b3a 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html
@@ -3,7 +3,7 @@
 
 Overloaded Algorithms For MFC String Types
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
 Overloaded
           Algorithms For MFC String Types
@@ -34,7 +34,7 @@
             here they are anyway:
           
                              
 
                              
-
+
             regex_match
           
                              
 
                              
@@ -62,18 +62,18 @@
 
                              
             Example:
           
                              
-
                              //
-// Extract filename part of a path from a CString and return the result
-// as another CString:
-//
-CString get_filename(const CString& path)
+
                              //
+// Extract filename part of a path from a CString and return the result
+// as another CString:
+//
+CString get_filename(const CString& path)
 {
    boost::tregex r(__T("(?:\\A|.*\\\\)([^\\\\]+)"));
    boost::tmatch what;
    if(boost::regex_match(path, what, r))
    {
-      // extract $1 as a CString:
-      return CString(what[1].first, what.length(1));
+      // extract $1 as a CString:
+      return CString(what[1].first, what.length(1));
    }
    else
    {
@@ -82,7 +82,7 @@
 }
 
                              
 
                              
-
+
             regex_match
             (second overload)
           
                              
@@ -100,17 +100,17 @@
 
                              
             Example:
           
                              
-
                              //
-// Find out if *password* meets our password requirements,
-// as defined by the regular expression *requirements*.
-//
-bool is_valid_password(const CString& password, const CString& requirements)
+
                              //
+// Find out if *password* meets our password requirements,
+// as defined by the regular expression *requirements*.
+//
+bool is_valid_password(const CString& password, const CString& requirements)
 {
    return boost::regex_match(password, boost::make_regex(requirements));
 }      
 
                              
 
                              
-
+
             regex_search
           
                              
 
                              
@@ -133,14 +133,14 @@
           
                              
 
                              CString extract_postcode(const CString& address)
 {
-   // searches throw address for a UK postcode and returns the result,
-   // the expression used is by Phil A. on www.regxlib.com:
-   boost::tregex r(__T("^(([A-Z]{1,2}[0-9]{1,2})|([A-Z]{1,2}[0-9][A-Z]))\\s?([0-9][A-Z]{2})$"));
+   // searches throw address for a UK postcode and returns the result,
+   // the expression used is by Phil A. on www.regxlib.com:
+   boost::tregex r(__T("^(([A-Z]{1,2}[0-9]{1,2})|([A-Z]{1,2}[0-9][A-Z]))\\s?([0-9][A-Z]{2})$"));
    boost::tmatch what;
    if(boost::regex_search(address, what, r))
    {
-      // extract $0 as a CString:
-      return CString(what[0].first, what.length());
+      // extract $0 as a CString:
+      return CString(what[0].first, what.length());
    }
    else
    {
@@ -149,7 +149,7 @@
 }      
 
                              
 
                              
-
+
             regex_search
             (second overload)
           
                              
@@ -164,7 +164,7 @@
             + s.GetLength(), e, f);
           
                              
 
                              
-
+
             regex_replace
           
                              
 
                              
@@ -198,12 +198,12 @@
 
                              
             Example:
           
                              
-
                              //
-// Take a credit card number as a string of digits, 
-// and reformat it as a human readable string with "-"
-// separating each group of four digits:
-//
-const boost::tregex e(__T("\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z"));
+
                              //
+// Take a credit card number as a string of digits, 
+// and reformat it as a human readable string with "-"
+// separating each group of four digits:
+//
+const boost::tregex e(__T("\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z"));
 const CString human_format = __T("$1-$2-$3-$4");
 
 CString human_readable_card_number(const CString& s)
@@ -214,7 +214,7 @@
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html
index cb763cca..fcb67178 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html
@@ -3,7 +3,7 @@
 
 Introduction to Boost.Regex and MFC Strings
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html
index 3b7337ae..8e06a688 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html
@@ -3,7 +3,7 @@
 
 Iterating Over the Matches Within An MFC String
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
 Iterating
           Over the Matches Within An MFC String
@@ -32,7 +32,7 @@
             an MFC/ATL string to a regex_iterator or regex_token_iterator:
           
                              
 
                              
-
+
             regex_iterator
             creation helper
           
                              
@@ -53,9 +53,9 @@
           
                              
 
                              void enumerate_links(const CString& html)
 {
-   // enumerate and print all the  links in some HTML text,
-   // the expression used is by Andew Lee on www.regxlib.com:
-   boost::tregex r(
+   // enumerate and print all the  links in some HTML text,
+   // the expression used is by Andew Lee on www.regxlib.com:
+   boost::tregex r(
       __T("href=[\"\']((http:\\/\\/|\\.\\/|\\/)?\\w+"
           "(\\.\\w+)*(\\/\\w+(\\.\\w+)?)*"
           "(\\/|\\?\\w*=\\w*(&\\w*=\\w*)*)?)[\"\']"));
@@ -68,7 +68,7 @@
 }
 
                              
 
                              
-
+
             regex_token_iterator
             creation helpers
           
                              
@@ -119,9 +119,9 @@
           
                              
 
                              void enumerate_links2(const CString& html)
 {
-   // enumerate and print all the  links in some HTML text,
-   // the expression used is by Andew Lee on www.regxlib.com:
-   boost::tregex r(
+   // enumerate and print all the  links in some HTML text,
+   // the expression used is by Andew Lee on www.regxlib.com:
+   boost::tregex r(
          __T("href=[\"\']((http:\\/\\/|\\.\\/|\\/)?\\w+"
              "(\\.\\w+)*(\\/\\w+(\\.\\w+)?)*"
              "(\\/|\\?\\w*=\\w*(&\\w*=\\w*)*)?)[\"\']"));
@@ -136,7 +136,7 @@
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html
index 5fdedc15..efc0eaab 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html
@@ -3,7 +3,7 @@
 
 Regular Expression Creation From an MFC String
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html
index 4df24625..0ec2280e 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html
@@ -3,7 +3,7 @@
 
 Regex Types Used With MFC Strings
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/posix.html b/doc/html/boost_regex/ref/posix.html
index 179dbb46..8a33185e 100644
--- a/doc/html/boost_regex/ref/posix.html
+++ b/doc/html/boost_regex/ref/posix.html
@@ -3,7 +3,7 @@
 
 POSIX Compatible C API's
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
@@ -163,7 +163,7 @@
         
                              
 
                              
 
                              
-
+
         regcomp
       
                              
 
                              
@@ -375,7 +375,7 @@
 
                              
 
                              
 
                              
-
+
         regerror
       
                              
 
                              
@@ -461,7 +461,7 @@
         buffer.
       
                              
 
                              
-
+
         regexec
       
                              
 
                              
@@ -529,7 +529,7 @@
 
                              
 
                              
 
                              
-
+
         regfree
       
                              
 
                              
@@ -539,7 +539,7 @@
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/regex_iterator.html b/doc/html/boost_regex/ref/regex_iterator.html
index a606c600..15615091 100644
--- a/doc/html/boost_regex/ref/regex_iterator.html
+++ b/doc/html/boost_regex/ref/regex_iterator.html
@@ -3,7 +3,7 @@
 
 regex_iterator
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
@@ -78,7 +78,7 @@
                           regex_constants::match_flag_type m = regex_constants::match_default);
 
 
                              
-
+
         Description
       
                              
 
                              
@@ -415,7 +415,7 @@
         m.
       
                              
 
                              
-
+
         Examples
       
                              
 
                              
@@ -430,34 +430,34 @@
 
 using namespace std;
 
-// purpose:
-// takes the contents of a file in the form of a string
-// and searches for all the C++ class definitions, storing
-// their locations in a map of strings/int's
-
+// purpose:
+// takes the contents of a file in the form of a string
+// and searches for all the C++ class definitions, storing
+// their locations in a map of strings/int's
+
 typedef std::map<std::string, std::string::difference_type, std::less<std::string> > map_type;
 
 const char* re = 
-   // possibly leading whitespace:   
-   "^[[:space:]]*" 
-   // possible template declaration:
-   "(template[[:space:]]*<[^;:{]+>[[:space:]]*)?"
-   // class or struct:
-   "(class|struct)[[:space:]]*" 
-   // leading declspec macros etc:
-   "("
+   // possibly leading whitespace:   
+   "^[[:space:]]*" 
+   // possible template declaration:
+   "(template[[:space:]]*<[^;:{]+>[[:space:]]*)?"
+   // class or struct:
+   "(class|struct)[[:space:]]*" 
+   // leading declspec macros etc:
+   "("
       "\\<\\w+\\>"
       "("
          "[[:blank:]]*\\([^)]*\\)"
       ")?"
       "[[:space:]]*"
    ")*" 
-   // the class name
-   "(\\<\\w*\\>)[[:space:]]*" 
-   // template specialisation parameters
-   "(<[^;:{]+>)?[[:space:]]*"
-   // terminate in { or :
-   "(\\{|:[^;\\{()]*\\{)";
+   // the class name
+   "(\\<\\w*\\>)[[:space:]]*" 
+   // template specialisation parameters
+   "(<[^;:{]+>)?[[:space:]]*"
+   // terminate in { or :
+   "(\\{|:[^;\\{()]*\\{)";
 
 
 boost::regex expression(re);
@@ -465,11 +465,11 @@
 
 bool regex_callback(const boost::match_results<std::string::const_iterator>& what)
 {
-   // what[0] contains the whole string
-   // what[5] contains the class name.
-   // what[6] contains the template specialisation if any.
-   // add class name and position to map:
-   class_index[what[5].str() + what[6].str()] = what.position(5);
+   // what[0] contains the whole string
+   // what[5] contains the class name.
+   // what[6] contains the template specialisation if any.
+   // add class name and position to map:
+   class_index[what[5].str() + what[6].str()] = what.position(5);
    return true;
 }
 
@@ -494,12 +494,12 @@
       cout << "Processing file " << argv[i] << endl;
       std::ifstream fs(argv[i]);
       load_file(text, fs);
-      // construct our iterators:
-      boost::sregex_iterator m1(text.begin(), text.end(), expression);
+      // construct our iterators:
+      boost::sregex_iterator m1(text.begin(), text.end(), expression);
       boost::sregex_iterator m2;
       std::for_each(m1, m2, &regex_callback);
-      // copy results:
-      cout << class_index.size() << " matches found" << endl;
+      // copy results:
+      cout << class_index.size() << " matches found" << endl;
       map_type::iterator c, d;
       c = class_index.begin();
       d = class_index.end();
@@ -516,7 +516,7 @@
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/regex_match.html b/doc/html/boost_regex/ref/regex_match.html
index eeacc58c..62628f3b 100644
--- a/doc/html/boost_regex/ref/regex_match.html
+++ b/doc/html/boost_regex/ref/regex_match.html
@@ -3,7 +3,7 @@
 
 regex_match
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
@@ -80,7 +80,7 @@
                  match_flag_type flags = match_default);
 
 
                              
-
+
         Description
       
                              
 
                              template <class BidirectionalIterator, class Allocator, class charT, class traits>
@@ -361,7 +361,7 @@
         Effects: Returns the result of regex_match(s.begin(), s.end(), e, flags).
       
                              
 
                              
-
+
         Examples
       
                              
 
                              
@@ -376,24 +376,24 @@
 
 regex expression("([0-9]+)(\\-| |$)(.*)"); 
 
-// process_ftp: 
-// on success returns the ftp response code, and fills 
-// msg with the ftp response message. 
-int process_ftp(const char* response, std::string* msg) 
+// process_ftp: 
+// on success returns the ftp response code, and fills 
+// msg with the ftp response message. 
+int process_ftp(const char* response, std::string* msg) 
 { 
    cmatch what; 
    if(regex_match(response, what, expression)) 
    { 
-      // what[0] contains the whole string 
-      // what[1] contains the response code 
-      // what[2] contains the separator character 
-      // what[3] contains the text message. 
-      if(msg) 
+      // what[0] contains the whole string 
+      // what[1] contains the response code 
+      // what[2] contains the separator character 
+      // what[3] contains the text message. 
+      if(msg) 
          msg->assign(what[3].first, what[3].second); 
       return std::atoi(what[1].first); 
    } 
-   // failure did not match 
-   if(msg) 
+   // failure did not match 
+   if(msg) 
       msg->erase(); 
    return -1; 
 }
@@ -401,7 +401,7 @@
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/regex_replace.html b/doc/html/boost_regex/ref/regex_replace.html
index 1b1a8a49..41c839e8 100644
--- a/doc/html/boost_regex/ref/regex_replace.html
+++ b/doc/html/boost_regex/ref/regex_replace.html
@@ -3,7 +3,7 @@
 
 regex_replace
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
@@ -53,7 +53,7 @@
                                   match_flag_type flags = match_default);
 
 
                              
-
+
         Description
       
                              
 
                              template <class OutputIterator, class BidirectionalIterator, class traits, class Formatter>
@@ -199,7 +199,7 @@
         and then returns result.
       
                              
 
                              
-
+
         Examples
       
                              
 
                              
@@ -214,10 +214,10 @@
 #include <fstream>
 #include <iostream>
 
-// purpose:
-// takes the contents of a file and transform to
-// syntax highlighted code in html format
-
+// purpose:
+// takes the contents of a file and transform to
+// syntax highlighted code in html format
+
 boost::regex e1, e2;
 extern const char* expression_text;
 extern const char* format_string;
@@ -253,15 +253,15 @@
       std::string out_name(std::string(argv[i]) + std::string(".htm"));
       std::ofstream os(out_name.c_str());
       os << header_text;
-      // strip '<' and '>' first by outputting to a
-      // temporary string stream
-      std::ostringstream t(std::ios::out | std::ios::binary);
+      // strip '<' and '>' first by outputting to a
+      // temporary string stream
+      std::ostringstream t(std::ios::out | std::ios::binary);
       std::ostream_iterator<char, char> oi(t);
       boost::regex_replace(oi, in.begin(), in.end(),
       e2, pre_format, boost::match_default | boost::format_all);
-      // then output to final output stream
-      // adding syntax highlighting:
-      std::string s(t.str());
+      // then output to final output stream
+      // adding syntax highlighting:
+      std::string s(t.str());
       std::ostream_iterator<char, char> out(os);
       boost::regex_replace(out, s.begin(), s.end(),
       e1, format_string, boost::match_default | boost::format_all);
@@ -278,17 +278,17 @@
 
 
 const char* expression_text = 
-   // preprocessor directives: index 1
-   "(^[[:blank:]]*#(?:[^\\\\\\n]|\\\\[^\\n[:punct:][:word:]]*[\\n[:punct:][:word:]])*)|"
-   // comment: index 2
-   "(//[^\\n]*|/\\*.*?\\*/)|"
-   // literals: index 3
-   "\\<([+-]?(?:(?:0x[[:xdigit:]]+)|(?:(?:[[:digit:]]*\\.)?[[:digit:]]+"
+   // preprocessor directives: index 1
+   "(^[[:blank:]]*#(?:[^\\\\\\n]|\\\\[^\\n[:punct:][:word:]]*[\\n[:punct:][:word:]])*)|"
+   // comment: index 2
+   "(//[^\\n]*|/\\*.*?\\*/)|"
+   // literals: index 3
+   "\\<([+-]?(?:(?:0x[[:xdigit:]]+)|(?:(?:[[:digit:]]*\\.)?[[:digit:]]+"
    "(?:[eE][+-]?[[:digit:]]+)?))u?(?:(?:int(?:8|16|32|64))|L)?)\\>|"
-   // string literals: index 4
-   "('(?:[^\\\\']|\\\\.)*'|\"(?:[^\\\\\"]|\\\\.)*\")|"
-   // keywords: index 5
-   "\\<(__asm|__cdecl|__declspec|__export|__far16|__fastcall|__fortran|__import"
+   // string literals: index 4
+   "('(?:[^\\\\']|\\\\.)*'|\"(?:[^\\\\\"]|\\\\.)*\")|"
+   // keywords: index 5
+   "\\<(__asm|__cdecl|__declspec|__export|__far16|__fastcall|__fortran|__import"
    "|__pascal|__rtti|__stdcall|_asm|_cdecl|__except|_export|_far16|_fastcall"
    "|__finally|_fortran|_import|_pascal|_stdcall|__thread|__try|asm|auto|bool"
    "|break|case|catch|cdecl|char|class|const|const_cast|continue|default|delete"
@@ -318,7 +318,7 @@
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/regex_search.html b/doc/html/boost_regex/ref/regex_search.html
index 070ecc4b..21ff4f50 100644
--- a/doc/html/boost_regex/ref/regex_search.html
+++ b/doc/html/boost_regex/ref/regex_search.html
@@ -3,7 +3,7 @@
 
 regex_search
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
@@ -73,7 +73,7 @@
                   match_flag_type flags = match_default);
 
 
                              
-
+
         Description
       
                              
 
                              template <class BidirectionalIterator, class Allocator, class charT, class traits>
@@ -357,7 +357,7 @@
         Effects: Returns the result of regex_search(s.begin(), s.end(), e, flags).
       
                              
 
                              
-
+
         Examples
       
                              
 
                              
@@ -371,11 +371,11 @@
 #include <map> 
 #include <boost/regex.hpp> 
 
-// purpose: 
-// takes the contents of a file in the form of a string 
-// and searches for all the C++ class definitions, storing 
-// their locations in a map of strings/int's 
-typedef std::map<std::string, int, std::less<std::string> > map_type; 
+// purpose: 
+// takes the contents of a file in the form of a string 
+// and searches for all the C++ class definitions, storing 
+// their locations in a map of strings/int's 
+typedef std::map<std::string, int, std::less<std::string> > map_type; 
 
 boost::regex expression(
    "^(template[[:space:]]*<[^;:{]+>[[:space:]]*)?"
@@ -393,17 +393,17 @@
    boost::match_flag_type flags = boost::match_default; 
    while(regex_search(start, end, what, expression, flags)) 
    { 
-      // what[0] contains the whole string 
-      // what[5] contains the class name. 
-      // what[6] contains the template specialisation if any. 
-      // add class name and position to map: 
-      m[std::string(what[5].first, what[5].second) 
+      // what[0] contains the whole string 
+      // what[5] contains the class name. 
+      // what[6] contains the template specialisation if any. 
+      // add class name and position to map: 
+      m[std::string(what[5].first, what[5].second) 
             + std::string(what[6].first, what[6].second)] 
          = what[5].first - file.begin(); 
-      // update search position: 
-      start = what[0].second; 
-      // update flags: 
-      flags |= boost::match_prev_avail; 
+      // update search position: 
+      start = what[0].second; 
+      // update flags: 
+      flags |= boost::match_prev_avail; 
       flags |= boost::match_not_bob; 
    } 
 }
@@ -411,7 +411,7 @@
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/regex_token_iterator.html b/doc/html/boost_regex/ref/regex_token_iterator.html
index 62379e2c..910cc0d7 100644
--- a/doc/html/boost_regex/ref/regex_token_iterator.html
+++ b/doc/html/boost_regex/ref/regex_token_iterator.html
@@ -3,7 +3,7 @@
 
 regex_token_iterator
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
@@ -136,7 +136,7 @@
          regex_constants::match_flag_type m = regex_constants::match_default);
 
 
                              
-
+
         Description
       
                              
 
                              regex_token_iterator();
@@ -357,7 +357,7 @@
         m.
       
                              
 
                              
-
+
         Examples
       
                              
 
                              
@@ -412,16 +412,16 @@
 void load_file(std::string& s, std::istream& is)
 {
    s.erase();
-   //
-   // attempt to grow string buffer to match file size,
-   // this doesn't always work...
-   s.reserve(is.rdbuf()->in_avail());
+   //
+   // attempt to grow string buffer to match file size,
+   // this doesn't always work...
+   s.reserve(is.rdbuf()->in_avail());
    char c;
    while(is.get(c))
    {
-      // use logarithmic growth stategy, in case
-      // in_avail (above) returned zero:
-      if(s.capacity() == s.size())
+      // use logarithmic growth stategy, in case
+      // in_avail (above) returned zero:
+      if(s.capacity() == s.size())
          s.reserve(s.capacity() * 3);
       s.append(1, c);
    }
@@ -444,12 +444,12 @@
          std::cout << *i++ << std::endl;
       }
    }
-   //
-   // alternative method:
-   // test the array-literal constructor, and split out the whole
-   // match as well as $1....
-   //
-   for(i = 1; i < argc; ++i)
+   //
+   // alternative method:
+   // test the array-literal constructor, and split out the whole
+   // match as well as $1....
+   //
+   for(i = 1; i < argc; ++i)
    {
       std::cout << "Findings URL's in " << argv[i] << ":" << std::endl;
       s.erase();
@@ -470,7 +470,7 @@
 
                              
 
-
                              
 
                              Copyright © 1998 -2010 John Maddock
                              
+
                              Copyright © 1998-2010 John Maddock
                              
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                              
diff --git a/doc/html/boost_regex/ref/regex_traits.html b/doc/html/boost_regex/ref/regex_traits.html
index 61052303..e3ce3b68 100644
--- a/doc/html/boost_regex/ref/regex_traits.html
+++ b/doc/html/boost_regex/ref/regex_traits.html
@@ -3,7 +3,7 @@
 
 regex_traits
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                              
 PrevUpHomeNext
 
                              
-
                              
+
                              
 
                              
@@ -43,10 +43,10 @@
 template <class charT>
 class w32_regex_traits;
 
-} // namespace boost
-
+} // namespace boost
+
 
                              
-
+
         Description
       
                              
 
                              
@@ -54,19 +54,19 @@
         just a thin wrapper around an actual implemention class, which may be one
         of:
       
                              
-
                                
-
                              • 
+
                                  
+
                                • 
             c_regex_traits: this
             class is deprecated, it wraps the C locale, and is used as the default
             implementation when the platform is not Win32, and the C++ locale is
             not available.
           
                                  • 
-
                                • 
+
                                • 
             cpp_regex_traits: the
             default traits class for non-Win32 platforms, allows the regex class
             to be imbued with a std::locale instance.
           
                                  • 
-
                                • 
+
                                • 
             w32_regex_traits: the
             default traits class implementation on Win32 platforms, allows the regex
             class to be imbued with an LCID.
@@ -76,12 +76,12 @@
         The default behavior can be altered by defining one of the following configuration
         macros in boost/regex/user.hpp
       
                                  
-
                                    
-
                                  • 
+
                                      
+
                                    • 
             BOOST_REGEX_USE_C_LOCALE: makes c_regex_traits
             the default.
           
                                      • 
-
                                    • 
+
                                    • 
             BOOST_REGEX_USE_CPP_LOCALE: makes cpp_regex_traits
             the default.
           
                                      • 
@@ -93,7 +93,7 @@
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/ref/sub_match.html b/doc/html/boost_regex/ref/sub_match.html
index 08ea2254..4082ed41 100644
--- a/doc/html/boost_regex/ref/sub_match.html
+++ b/doc/html/boost_regex/ref/sub_match.html
@@ -3,7 +3,7 @@
 
 sub_match
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
@@ -113,10 +113,10 @@
    const capture_sequence_type& captures()const;
 #endif
 };
-//
-// comparisons to another sub_match:
-//
-template <class BidirectionalIterator>
+//
+// comparisons to another sub_match:
+//
+template <class BidirectionalIterator>
 bool operator == (const sub_match<BidirectionalIterator>& lhs,
                   const sub_match<BidirectionalIterator>& rhs);
 template <class BidirectionalIterator>
@@ -136,10 +136,10 @@
                const sub_match<BidirectionalIterator>& rhs);
 
 
-//
-// comparisons to a basic_string:
-//
-template <class BidirectionalIterator, class traits, class Allocator> 
+//
+// comparisons to a basic_string:
+//
+template <class BidirectionalIterator, class traits, class Allocator> 
 bool operator == (const std::basic_string<iterator_traits<BidirectionalIterator>::value_type, 
                                           traits, 
                                           Allocator>& lhs,
@@ -201,10 +201,10 @@
                                           traits, 
                                           Allocator>& rhs);
 
-//
-// comparisons to a pointer to a character array:
-//
-template <class BidirectionalIterator> 
+//
+// comparisons to a pointer to a character array:
+//
+template <class BidirectionalIterator> 
 bool operator == (typename iterator_traits<BidirectionalIterator>::value_type const* lhs, 
                   const sub_match<BidirectionalIterator>& rhs); 
 template <class BidirectionalIterator> 
@@ -242,10 +242,10 @@
 bool operator <= (const sub_match<BidirectionalIterator>& lhs, 
                   typename iterator_traits<BidirectionalIterator>::value_type const* rhs); 
 
-//
-// comparisons to a single character:
-//
-template <class BidirectionalIterator> 
+//
+// comparisons to a single character:
+//
+template <class BidirectionalIterator> 
 bool operator == (typename iterator_traits<BidirectionalIterator>::value_type const& lhs, 
                   const sub_match<BidirectionalIterator>& rhs); 
 template <class BidirectionalIterator> 
@@ -282,10 +282,10 @@
 template <class BidirectionalIterator> 
 bool operator <= (const sub_match<BidirectionalIterator>& lhs, 
                   typename iterator_traits<BidirectionalIterator>::value_type const& rhs); 
-// 
-// addition operators: 
-//
-template <class BidirectionalIterator, class traits, class Allocator> 
+// 
+// addition operators: 
+//
+template <class BidirectionalIterator, class traits, class Allocator> 
 std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type, traits, Allocator> 
    operator + (const std::basic_string<typename iterator_traits<BidirectionalIterator>::value_type, 
                                        traits, 
@@ -318,22 +318,22 @@
    operator + (const sub_match<BidirectionalIterator>& m1,
                const sub_match<BidirectionalIterator>& m2);
 
-//
-// stream inserter:
-//
-template <class charT, class traits, class BidirectionalIterator>
+//
+// stream inserter:
+//
+template <class charT, class traits, class BidirectionalIterator>
 basic_ostream<charT, traits>&
    operator << (basic_ostream<charT, traits>& os,
                const sub_match<BidirectionalIterator>& m);
 
-} // namespace boost
-
+} // namespace boost
+
 
                                    
-
+
         Description
       
                                    
 
                                    
-
+
         Members
       
                                    
 
                                    typedef typename std::iterator_traits<iterator>::value_type value_type;
@@ -429,24 +429,24 @@
         Rationale: Enabling this feature has several
         consequences:
       
                                    
-
                                      
-
                                    • 
+
                                        
+
                                      • 
             sub_match occupies more memory resulting in complex expressions running
             out of memory or stack space more quickly during matching.
           
                                        • 
-
                                      • 
+
                                      • 
             The matching algorithms are less efficient at handling some features
             (independent sub-expressions for example), even when match_extra is not
             used.
           
                                        • 
-
                                      • 
+
                                      • 
             The matching algorithms are much less efficient (i.e. slower), when match_extra
             is used. Mostly this is down to the extra memory allocations that have
             to take place.
           
                                        • 
 
                                      
 
                                      
-
+
         sub_match
         non-member operators
       
                                      
@@ -883,7 +883,7 @@
         + m2.str().
       
                                      
 
                                      
-
+
         Stream inserter
       
                                      
 
                                      template <class charT, class traits, class BidirectionalIterator>
@@ -897,7 +897,7 @@
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/ref/syntax_option_type.html b/doc/html/boost_regex/ref/syntax_option_type.html
index b4811c1c..f21d4c99 100644
--- a/doc/html/boost_regex/ref/syntax_option_type.html
+++ b/doc/html/boost_regex/ref/syntax_option_type.html
@@ -3,7 +3,7 @@
 
 syntax_option_type
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
@@ -43,7 +43,7 @@
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html
index 9edeb947..6b54e08a 100644
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html
@@ -3,7 +3,7 @@
 
 Options for POSIX Basic Regular Expressions
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html
index d4243ac9..fd102e82 100644
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html
@@ -3,7 +3,7 @@
 
 Options for POSIX Extended Regular Expressions
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html
index 6ef00d7a..2060e20c 100644
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html
@@ -3,7 +3,7 @@
 
 Options for Literal Strings
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
 Options
         for Literal Strings
@@ -143,7 +143,7 @@
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html
index 7cff7d25..1c596b9a 100644
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html
@@ -3,7 +3,7 @@
 
 Overview of syntax_option_type
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
 Overview
         of syntax_option_type
@@ -60,7 +60,7 @@
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html
index 15339f7f..9d032204 100644
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html
@@ -3,7 +3,7 @@
 
 Options for Perl Regular Expressions
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html
index 2d6a49da..58e12b87 100644
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html
@@ -3,7 +3,7 @@
 
 syntax_option_type Synopsis
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
 syntax_option_type
         Synopsis
@@ -38,8 +38,8 @@
 
 typedef implementation-specific-bitmask-type syntax_option_type;
 
-// these flags are standardized:
-static const syntax_option_type normal;
+// these flags are standardized:
+static const syntax_option_type normal;
 static const syntax_option_type ECMAScript = normal;
 static const syntax_option_type JavaScript = normal;
 static const syntax_option_type JScript = normal;
@@ -55,40 +55,40 @@
 static const syntax_option_type optimize;
 static const syntax_option_type collate;
 
-// 
-// The remaining options are specific to Boost.Regex:
-//
-
-// Options common to both Perl and POSIX regular expressions:
-static const syntax_option_type newline_alt;
+// 
+// The remaining options are specific to Boost.Regex:
+//
+
+// Options common to both Perl and POSIX regular expressions:
+static const syntax_option_type newline_alt;
 static const syntax_option_type no_except;
 static const syntax_option_type  save_subexpression_location;
 
-// Perl specific options:
-static const syntax_option_type no_mod_m;
+// Perl specific options:
+static const syntax_option_type no_mod_m;
 static const syntax_option_type no_mod_s;
 static const syntax_option_type mod_s;
 static const syntax_option_type mod_x;
 static const syntax_option_type no_empty_expressions;
 
-// POSIX extended specific options:
-static const syntax_option_type no_escape_in_lists;
+// POSIX extended specific options:
+static const syntax_option_type no_escape_in_lists;
 static const syntax_option_type no_bk_refs;
 
-// POSIX basic specific options:
-static const syntax_option_type no_escape_in_lists;
+// POSIX basic specific options:
+static const syntax_option_type no_escape_in_lists;
 static const syntax_option_type no_char_classes;
 static const syntax_option_type no_intervals;
 static const syntax_option_type bk_plus_qm;
 static const syntax_option_type bk_vbar;
 
-} // namespace regex_constants
-} // namespace std
-
+} // namespace regex_constants
+} // namespace std
+
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/syntax.html b/doc/html/boost_regex/syntax.html
index 131e31fd..9289a0d0 100644
--- a/doc/html/boost_regex/syntax.html
+++ b/doc/html/boost_regex/syntax.html
@@ -3,7 +3,7 @@
 
 Regular Expression Syntax
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
@@ -61,16 +61,16 @@
       There are three main syntax options available, depending upon how you construct
       the regular expression object:
     
                                    
-
                                      
-
                                    • 
+
                                      
 
-
                                      
 
                                      Copyright © 1998 -2010 John Maddock
                                      
+
                                      Copyright © 1998-2010 John Maddock
                                      
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                      
diff --git a/doc/html/boost_regex/syntax/basic_extended.html b/doc/html/boost_regex/syntax/basic_extended.html
index 03d2c215..2f763d7c 100644
--- a/doc/html/boost_regex/syntax/basic_extended.html
+++ b/doc/html/boost_regex/syntax/basic_extended.html
@@ -3,7 +3,7 @@
 
 POSIX Extended Regular Expression Syntax
 
-
+
 
 
 
@@ -22,13 +22,13 @@
 
                                      
 PrevUpHomeNext
 
                                      
-
                                      
+
                                      
 
                                      
 
                                      
-
+
         Synopsis
       
                                      
 
                                      
@@ -38,13 +38,13 @@
         the flag extended to the
         regex constructor, for example:
       
                                      
-
                                      // e1 is a case sensitive POSIX-Extended expression:
-boost::regex e1(my_expression, boost::regex::extended);
-// e2 a case insensitive POSIX-Extended expression:
-boost::regex e2(my_expression, boost::regex::extended|boost::regex::icase);
+
                                      // e1 is a case sensitive POSIX-Extended expression:
+boost::regex e1(my_expression, boost::regex::extended);
+// e2 a case insensitive POSIX-Extended expression:
+boost::regex e2(my_expression, boost::regex::extended|boost::regex::icase);
 
                                      
 
                                      
-
+
         POSIX
         Extended Syntax
       
                                      
@@ -54,25 +54,25 @@
       
                                      
 
                                      .[{}()\*+?|^$
                                      
 
                                      
-
+
         Wildcard:
       
                                      
 
                                      
         The single character '.' when used outside of a character set will match
         any single character except:
       
                                      
-
                                        
-
                                      • 
+
                                          
+
                                        • 
             The NULL character when the flag match_no_dot_null
             is passed to the matching algorithms.
           
                                          • 
-
                                        • 
+
                                        • 
             The newline character when the flag match_not_dot_newline
             is passed to the matching algorithms.
           
                                          • 
 
                                        
 
                                        
-
+
         Anchors:
       
                                        
 
                                        
@@ -84,7 +84,7 @@
         of an expression, or the last character of a sub-expression.
       
                                        
 
                                        
-
+
         Marked
         sub-expressions:
       
                                        
@@ -96,7 +96,7 @@
         to by a back-reference.
       
                                        
 
                                        
-
+
         Repeats:
       
                                        
 
                                        
@@ -182,7 +182,7 @@ cab
         operator to be applied to.
       
                                        
 
                                        
-
+
         Back references:
       
                                        
 
                                        
@@ -212,7 +212,7 @@ cab
         
                                      
 
                                    
 
                                    
-
+
         Alternation
       
                                    
 
                                    
@@ -225,7 +225,7 @@ cab
         will match either of "abd" or "abef".
       
                                    
 
                                    
-
+
         Character
         sets:
       
                                    
@@ -238,7 +238,7 @@ cab
         A bracket expression may contain any combination of the following:
       
                                    
 
                                    
-
+
         Single
         characters:
       
                                    
@@ -247,7 +247,7 @@ cab
         or 'c'.
       
                                    
 
                                    
-
+
         Character
         ranges:
       
                                    
@@ -263,7 +263,7 @@ cab
         the code points of the characters only.
       
                                    
 
                                    
-
+
         Negation:
       
                                    
 
                                    
@@ -272,7 +272,7 @@ cab
         range a-c.
       
                                    
 
                                    
-
+
         Character
         classes:
       
                                    
@@ -282,7 +282,7 @@ cab
         character class names.
       
                                    
 
                                    
-
+
         Collating
         Elements:
       
                                    
@@ -310,7 +310,7 @@ cab
         matches a NUL character.
       
                                    
 
                                    
-
+
         Equivalence
         classes:
       
                                    
@@ -327,7 +327,7 @@ cab
         or even all locales on one platform.
       
                                    
 
                                    
-
+
         Combinations:
       
                                    
 
                                    
@@ -335,21 +335,21 @@ cab
         [[:digit:]a-c[.NUL.]].
       
                                    
 
                                    
-
+
         Escapes
       
                                    
 
                                    
         The POSIX standard defines no escape sequences for POSIX-Extended regular
         expressions, except that:
       
                                    
-
                                      
-
                                    • 
+
                                        
+
                                      • 
             Any special character preceded by an escape shall match itself.
           
                                        • 
-
                                      • 
+
                                      • 
             The effect of any ordinary character being preceded by an escape is undefined.
           
                                        • 
-
                                      • 
+
                                      • 
             An escape inside a character class declaration shall match itself: in
             other words the escape character is not "special" inside a
             character class declaration; so [\^]
@@ -361,7 +361,7 @@ cab
         extensions are also supported by Boost.Regex:
       
                                        
 
                                        
-
+
         Escapes
         matching a specific character
       
                                        
@@ -550,7 +550,7 @@ cab
 
                                    
 
                                    
 
                                    
-
+
         "Single
         character" character classes:
       
                                    
@@ -704,7 +704,7 @@ cab
 
                                    
 
                                    
 
                                    
-
+
         Character
         Properties
       
                                    
@@ -811,7 +811,7 @@ cab
         matches any "digit" character, as does \p{digit}.
       
                                    
 
                                    
-
+
         Word Boundaries
       
                                    
 
                                    
@@ -886,7 +886,7 @@ cab
 
                                    
 
                                    
 
                                    
-
+
         Buffer
         boundaries
       
                                    
@@ -977,7 +977,7 @@ cab
 
                                    
 
                                    
 
                                    
-
+
         Continuation
         Escape
       
                                    
@@ -989,7 +989,7 @@ cab
         match to start where the last one ended.
       
                                    
 
                                    
-
+
         Quoting
         escape
       
                                    
@@ -1003,7 +1003,7 @@ cab
 \*+aaa
 
 
                                    
-
+
         Unicode
         escapes
       
                                    
@@ -1054,7 +1054,7 @@ cab
 
                                    
 
                                    
 
                                    
-
+
         Any other
         escape
       
                                    
@@ -1063,44 +1063,44 @@ cab
         \@ matches a literal '@'.
       
                                    
 
                                    
-
+
         Operator
         precedence
       
                                    
 
                                    
         The order of precedence for of operators is as follows:
       
                                    
-
                                      
-
                                    1. 
+
                                        
+
                                      1. 
             Collation-related bracket symbols [==]
             [::] [..]
           
                                        2. 
-
                                      2. 
+
                                      3. 
             Escaped characters \
           
                                        4. 
-
                                      4. 
+
                                      5. 
             Character set (bracket expression) []
           
                                        6. 
-
                                      6. 
+
                                      7. 
             Grouping ()
           
                                        8. 
-
                                      8. 
+
                                      9. 
             Single-character-ERE duplication *
             + ?
             {m,n}
           
                                        10. 
-
                                      10. 
+
                                      11. 
             Concatenation
           
                                        12. 
-
                                      12. 
+
                                      13. 
             Anchoring ^$
           
                                        14. 
-
                                      14. 
+
                                      15. 
             Alternation |
           
                                        16. 
 
                                      
 
                                      
-
+
         What
         Gets Matched
       
                                      
@@ -1110,11 +1110,11 @@ cab
         rule.
       
                                      
 
                                      
-
+
         Variations
       
                                      
 
                                      
-
+
         Egrep
       
                                      
 
                                      
@@ -1135,7 +1135,7 @@ cab
         used with the -E option.
       
                                      
 
                                      
-
+
         awk
       
                                      
 
                                      
@@ -1149,7 +1149,7 @@ cab
         these by default anyway.
       
                                      
 
                                      
-
+
         Options
       
                                      
 
                                      
@@ -1162,7 +1162,7 @@ cab
         modify how the case and locale sensitivity are to be applied.
       
                                      
 
                                      
-
+
         References
       
                                      
 
                                      
@@ -1183,7 +1183,7 @@ cab
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/syntax/basic_syntax.html b/doc/html/boost_regex/syntax/basic_syntax.html
index 7c262c71..3f51592d 100644
--- a/doc/html/boost_regex/syntax/basic_syntax.html
+++ b/doc/html/boost_regex/syntax/basic_syntax.html
@@ -3,7 +3,7 @@
 
 POSIX Basic Regular Expression Syntax
 
-
+
 
 
 
@@ -22,13 +22,13 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
 
                                    
-
+
         Synopsis
       
                                    
 
                                    
@@ -37,13 +37,13 @@
         the flag basic to the regex
         constructor (see syntax_option_type), for example:
       
                                    
-
                                    // e1 is a case sensitive POSIX-Basic expression:
-boost::regex e1(my_expression, boost::regex::basic);
-// e2 a case insensitive POSIX-Basic expression:
-boost::regex e2(my_expression, boost::regex::basic|boost::regex::icase);
+
                                    // e1 is a case sensitive POSIX-Basic expression:
+boost::regex e1(my_expression, boost::regex::basic);
+// e2 a case insensitive POSIX-Basic expression:
+boost::regex e2(my_expression, boost::regex::basic|boost::regex::icase);
 
                                    
 
                                    
-
+
         POSIX
         Basic Syntax
       
                                    
@@ -53,25 +53,25 @@
       
                                    
 
                                    .[\*^$
                                    
 
                                    
-
+
         Wildcard:
       
                                    
 
                                    
         The single character '.' when used outside of a character set will match
         any single character except:
       
                                    
-
                                      
-
                                    • 
+
                                        
+
                                      • 
             The NULL character when the flag match_no_dot_null
             is passed to the matching algorithms.
           
                                        • 
-
                                      • 
+
                                      • 
             The newline character when the flag match_not_dot_newline
             is passed to the matching algorithms.
           
                                        • 
 
                                      
 
                                      
-
+
         Anchors:
       
                                      
 
                                      
@@ -83,7 +83,7 @@
         of an expression, or the last character of a sub-expression.
       
                                      
 
                                      
-
+
         Marked
         sub-expressions:
       
                                      
@@ -95,7 +95,7 @@
         by a back-reference.
       
                                      
 
                                      
-
+
         Repeats:
       
                                      
 
                                      
@@ -153,7 +153,7 @@ aaaa
         to.
       
                                      
 
                                      
-
+
         Back references:
       
                                      
 
                                      
@@ -171,7 +171,7 @@ aaaa
       
                                      
 
                                      aaabba
                                      
 
                                      
-
+
         Character
         sets:
       
                                      
@@ -184,7 +184,7 @@ aaaa
         A bracket expression may contain any combination of the following:
       
                                      
 
                                      
-
+
         Single
         characters:
       
                                      
@@ -193,7 +193,7 @@ aaaa
         or 'c'.
       
                                      
 
                                      
-
+
         Character
         ranges:
       
                                      
@@ -209,7 +209,7 @@ aaaa
         of the characters only.
       
                                      
 
                                      
-
+
         Negation:
       
                                      
 
                                      
@@ -218,7 +218,7 @@ aaaa
         range a-c.
       
                                      
 
                                      
-
+
         Character
         classes:
       
                                      
@@ -228,7 +228,7 @@ aaaa
         character class names.
       
                                      
 
                                      
-
+
         Collating
         Elements:
       
                                      
@@ -257,7 +257,7 @@ aaaa
         element names.
       
                                      
 
                                      
-
+
         Equivalence
         classes:
       
                                      
@@ -274,7 +274,7 @@ aaaa
         or even all locales on one platform.
       
                                      
 
                                      
-
+
         Combinations:
       
                                      
 
                                      
@@ -282,7 +282,7 @@ aaaa
         [[:digit:]a-c[.NUL.]].
       
                                      
 
                                      
-
+
         Escapes
       
                                      
 
                                      
@@ -297,7 +297,7 @@ aaaa
         will match either a literal '\' or a '^'.
       
                                      
 
                                      
-
+
         What Gets
         Matched
       
                                      
@@ -307,11 +307,11 @@ aaaa
         rule.
       
                                      
 
                                      
-
+
         Variations
       
                                      
 
                                      
-
+
         Grep
       
                                      
 
                                      
@@ -329,7 +329,7 @@ aaaa
         As its name suggests, this behavior is consistent with the Unix utility grep.
       
                                      
 
                                      
-
+
         emacs
       
                                      
 
                                      
@@ -609,7 +609,7 @@ aaaa
         leftmost-longest rule.
       
                                      
 
                                      
-
+
         Options
       
                                      
 
                                      
@@ -623,7 +623,7 @@ aaaa
         options modify how the case and locale sensitivity are to be applied.
       
                                      
 
                                      
-
+
         References
       
                                      
 
                                      
@@ -642,7 +642,7 @@ aaaa
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/syntax/character_classes.html b/doc/html/boost_regex/syntax/character_classes.html
index dbb2444a..b0ed57b7 100644
--- a/doc/html/boost_regex/syntax/character_classes.html
+++ b/doc/html/boost_regex/syntax/character_classes.html
@@ -3,7 +3,7 @@
 
 Character Class Names
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
 Character Class
       Names
@@ -36,7 +36,7 @@
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html b/doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html
index cc4988ea..524e1377 100644
--- a/doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html
+++ b/doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html
@@ -3,7 +3,7 @@
 
 Character classes that are supported by Unicode Regular Expressions
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/syntax/character_classes/std_char_clases.html b/doc/html/boost_regex/syntax/character_classes/std_char_clases.html
index 88821b72..f2eac34a 100644
--- a/doc/html/boost_regex/syntax/character_classes/std_char_clases.html
+++ b/doc/html/boost_regex/syntax/character_classes/std_char_clases.html
@@ -3,7 +3,7 @@
 
 Character Classes that are Always Supported
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/syntax/collating_names.html b/doc/html/boost_regex/syntax/collating_names.html
index a638aff1..c06633ff 100644
--- a/doc/html/boost_regex/syntax/collating_names.html
+++ b/doc/html/boost_regex/syntax/collating_names.html
@@ -3,7 +3,7 @@
 
 Collating Names
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
@@ -36,7 +36,7 @@
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/syntax/collating_names/digraphs.html b/doc/html/boost_regex/syntax/collating_names/digraphs.html
index c9308e31..aa482eef 100644
--- a/doc/html/boost_regex/syntax/collating_names/digraphs.html
+++ b/doc/html/boost_regex/syntax/collating_names/digraphs.html
@@ -3,7 +3,7 @@
 
 Digraphs
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
@@ -47,7 +47,7 @@
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/syntax/collating_names/named_unicode.html b/doc/html/boost_regex/syntax/collating_names/named_unicode.html
index 08f647ae..013151b3 100644
--- a/doc/html/boost_regex/syntax/collating_names/named_unicode.html
+++ b/doc/html/boost_regex/syntax/collating_names/named_unicode.html
@@ -3,7 +3,7 @@
 
 Named Unicode Characters
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
 Named
         Unicode Characters
@@ -40,7 +40,7 @@
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html b/doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html
index ad5df08d..129fbf77 100644
--- a/doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html
+++ b/doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html
@@ -3,7 +3,7 @@
 
 POSIX Symbolic Names
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
 POSIX
         Symbolic Names
@@ -971,7 +971,7 @@
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/syntax/leftmost_longest_rule.html b/doc/html/boost_regex/syntax/leftmost_longest_rule.html
index 8ece7910..a801237c 100644
--- a/doc/html/boost_regex/syntax/leftmost_longest_rule.html
+++ b/doc/html/boost_regex/syntax/leftmost_longest_rule.html
@@ -3,7 +3,7 @@
 
 The Leftmost Longest Rule
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
 The Leftmost
       Longest Rule
@@ -32,32 +32,32 @@
         location, for POSIX basic and extended regular expressions, the "best"
         match is determined as follows:
       
                                    
-
                                      
-
                                    1. 
+
                                        
+
                                      1. 
             Find the leftmost match, if there is only one match possible at this
             location then return it.
           
                                        2. 
-
                                      2. 
+
                                      3. 
             Find the longest of the possible matches, along with any ties. If there
             is only one such possible match then return it.
           
                                        4. 
-
                                      4. 
+
                                      5. 
             If there are no marked sub-expressions, then all the remaining alternatives
             are indistinguishable; return the first of these found.
           
                                        6. 
-
                                      6. 
+
                                      7. 
             Find the match which has matched the first sub-expression in the leftmost
             position, along with any ties. If there is only on such match possible
             then return it.
           
                                        8. 
-
                                      8. 
+
                                      9. 
             Find the match which has the longest match for the first sub-expression,
             along with any ties. If there is only one such match then return it.
           
                                        10. 
-
                                      10. 
+
                                      11. 
             Repeat steps 4 and 5 for each additional marked sub-expression.
           
                                        12. 
-
                                      12. 
+
                                      13. 
             If there is still more than one possible match remaining, then they are
             indistinguishable; return the first one found.
           
                                        14. 
@@ -65,7 +65,7 @@
 
                                      
 
-
                                      
 
                                      Copyright © 1998 -2010 John Maddock
                                      
+
                                      Copyright © 1998-2010 John Maddock
                                      
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                      
diff --git a/doc/html/boost_regex/syntax/perl_syntax.html b/doc/html/boost_regex/syntax/perl_syntax.html
index bc1a78fa..efa913c3 100644
--- a/doc/html/boost_regex/syntax/perl_syntax.html
+++ b/doc/html/boost_regex/syntax/perl_syntax.html
@@ -3,7 +3,7 @@
 
 Perl Regular Expression Syntax
 
-
+
 
 
 
@@ -22,13 +22,13 @@
 
                                      
 PrevUpHomeNext
 
                                      
-
                                      
+
                                      
 
                                      
 
                                      
-
+
         Synopsis
       
                                      
 
                                      
@@ -36,14 +36,14 @@
         language Perl . Perl regular expressions are the default behavior in Boost.Regex
         or you can pass the flag perl to the basic_regex constructor, for example:
       
                                      
-
                                      // e1 is a case sensitive Perl regular expression: 
-// since Perl is the default option there's no need to explicitly specify the syntax used here:
-boost::regex e1(my_expression);
-// e2 a case insensitive Perl regular expression:
-boost::regex e2(my_expression, boost::regex::perl|boost::regex::icase);
+
                                      // e1 is a case sensitive Perl regular expression: 
+// since Perl is the default option there's no need to explicitly specify the syntax used here:
+boost::regex e1(my_expression);
+// e2 a case insensitive Perl regular expression:
+boost::regex e2(my_expression, boost::regex::perl|boost::regex::icase);
 
                                      
 
                                      
-
+
         Perl
         Regular Expression Syntax
       
                                      
@@ -53,27 +53,27 @@
       
                                      
 
                                      .[{}()\*+?|^$
                                      
 
                                      
-
+
         Wildcard
       
                                      
 
                                      
         The single character '.' when used outside of a character set will match
         any single character except:
       
                                      
-
                                      
 
                                    
 
                                    
-
+
         "Single
         character" character classes:
       
                                    
@@ -894,7 +892,7 @@
 
                                    
 
                                    
 
                                    
-
+
         Character
         Properties
       
                                    
@@ -1002,7 +1000,7 @@
         as does \p{digit}.
       
                                    
 
                                    
-
+
         Word Boundaries
       
                                    
 
                                    
@@ -1021,7 +1019,7 @@
         \B Matches only when not at a word boundary.
       
                                    
 
                                    
-
+
         Buffer boundaries
       
                                    
 
                                    
@@ -1036,7 +1034,7 @@
         \' Matches at the end of a buffer only.
       
                                    
 
                                    
-        \A Matches at the start of a buffer only (the same as \\\`).
+        \A Matches at the start of a buffer only (the same as =\`=).
       
                                    
 
                                    
         \z Matches at the end of a buffer only (the same as \\').
@@ -1048,7 +1046,7 @@
         (?=\n?\z).
       
                                    
 
                                    
-
+
         Continuation
         Escape
       
                                    
@@ -1060,7 +1058,7 @@
         one ended.
       
                                    
 
                                    
-
+
         Quoting escape
       
                                    
 
                                    
@@ -1073,7 +1071,7 @@
 \*+aaa
 
 
                                    
-
+
         Unicode escapes
       
                                    
 
                                    
@@ -1083,7 +1081,7 @@
         followed by a sequence of zero or more combining characters.
       
                                    
 
                                    
-
+
         Matching
         Line Endings
       
                                    
@@ -1092,7 +1090,7 @@
         sequence, specifically it is identical to the expression (?>\x0D\x0A?|[\x0A-\x0C\x85\x{2028}\x{2029}]).
       
                                    
 
                                    
-
+
         Keeping
         back some text
       
                                    
@@ -1107,7 +1105,7 @@
         This can be used to simulate variable width lookbehind assertions.
       
                                    
 
                                    
-
+
         Any other
         escape
       
                                    
@@ -1116,7 +1114,7 @@
         \@ matches a literal '@'.
       
                                    
 
                                    
-
+
         Perl
         Extended Patterns
       
                                    
@@ -1125,7 +1123,7 @@
         (?.
       
                                    
 
                                    
-
+
         Named
         Subexpressions
       
                                    
@@ -1147,14 +1145,14 @@
         format string for search and replace operations, or in the match_results member functions.
       
                                    
 
                                    
-
+
         Comments
       
                                    
 
                                    
         (?# ... ) is treated as a comment, it's contents are ignored.
       
                                    
 
                                    
-
+
         Modifiers
       
                                    
 
                                    
@@ -1168,7 +1166,7 @@
         pattern only.
       
                                    
 
                                    
-
+
         Non-marking
         groups
       
                                    
@@ -1177,7 +1175,7 @@
         an additional sub-expression.
       
                                    
 
                                    
-
+
         Branch reset
       
                                    
 
                                    
@@ -1199,7 +1197,7 @@
 # 1            2         2  3        2     3     4
 
 
                                    
-
+
         Lookahead
       
                                    
 
                                    
@@ -1222,7 +1220,7 @@
         could be used to validate the password.
       
                                    
 
                                    
-
+
         Lookbehind
       
                                    
 
                                    
@@ -1236,7 +1234,7 @@
         (pattern must be of fixed length).
       
                                    
 
                                    
-
+
         Independent
         sub-expressions
       
                                    
@@ -1249,7 +1247,7 @@
         no match is found at all.
       
                                    
 
                                    
-
+
         Recursive
         Expressions
       
                                    
@@ -1276,7 +1274,7 @@
         (?&NAME) recurses to named sub-expression NAME.
       
                                    
 
                                    
-
+
         Conditional
         Expressions
       
                                    
@@ -1298,27 +1296,27 @@
 
                                    
         Here is a summary of the possible predicates:
       
                                    
-
                                      
-
                                    • 
+
                                        
+
                                      • 
             (?(?=assert)yes-pattern|no-pattern) Executes yes-pattern
             if the forward look-ahead assert matches, otherwise executes no-pattern.
           
                                        • 
-
                                      • 
+
                                      • 
             (?(?!assert)yes-pattern|no-pattern) Executes yes-pattern
             if the forward look-ahead assert does not match, otherwise executes
             no-pattern.
           
                                        • 
-
                                      • 
+
                                      • 
             (?(R)yes-pattern|no-pattern) Executes yes-pattern
             if we are executing inside a recursion, otherwise executes no-pattern.
           
                                        • 
-
                                      • 
+
                                      • 
             (?(RN)yes-pattern|no-pattern)
             Executes yes-pattern if we are executing inside
             a recursion to sub-expression N, otherwise executes
             no-pattern.
           
                                        • 
-
                                      • 
+
                                      • 
             (?(DEFINE)never-exectuted-pattern) Defines a block
             of code that is never executed and matches no characters: this is usually
             used to define one or more named sub-expressions which are refered to
@@ -1326,42 +1324,42 @@
           
                                        • 
 
                                      
 
                                      
-
+
         Operator
         precedence
       
                                      
 
                                      
         The order of precedence for of operators is as follows:
       
                                      
-
                                        
-
                                      1. 
+
                                          
+
                                        1. 
             Collation-related bracket symbols [==]
             [::] [..]
           
                                          2. 
-
                                        2. 
+
                                        3. 
             Escaped characters \
           
                                          4. 
-
                                        4. 
+
                                        5. 
             Character set (bracket expression) []
           
                                          6. 
-
                                        6. 
+
                                        7. 
             Grouping ()
           
                                          8. 
-
                                        8. 
+
                                        9. 
             Single-character-ERE duplication * + ? {m,n}
           
                                          10. 
-
                                        10. 
+
                                        11. 
             Concatenation
           
                                          12. 
-
                                        12. 
+
                                        13. 
             Anchoring ^$
           
                                          14. 
-
                                        14. 
+
                                        15. 
             Alternation |
           
                                          16. 
 
                                        
 
                                        
-
+
         What gets
         matched
       
                                        
@@ -1537,7 +1535,7 @@
 
                                    
 
                                    
 
                                    
-
+
         Variations
       
                                    
 
                                    
@@ -1546,7 +1544,7 @@
         and JScript are all synonyms for perl.
       
                                    
 
                                    
-
+
         Options
       
                                    
 
                                    
@@ -1558,7 +1556,7 @@
         are to be applied.
       
                                    
 
                                    
-
+
         Pattern
         Modifiers
       
                                    
@@ -1570,7 +1568,7 @@
         and no_mod_s.
       
                                    
 
                                    
-
+
         References
       
                                    
 
                                    
@@ -1579,7 +1577,7 @@
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/boost_regex/unicode.html b/doc/html/boost_regex/unicode.html
index 04f48de3..58076986 100644
--- a/doc/html/boost_regex/unicode.html
+++ b/doc/html/boost_regex/unicode.html
@@ -3,7 +3,7 @@
 
 Unicode and Boost.Regex
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
                                    
 PrevUpHomeNext
 
                                    
-
                                    
+
                                    
 
                                    
@@ -30,7 +30,7 @@
       There are two ways to use Boost.Regex with Unicode strings:
     
                                    
 
                                    
-
+
       Rely on wchar_t
     
                                    
 
                                    
@@ -40,23 +40,23 @@
       std::iswlower etc), then you can use boost::wregex
       to process Unicode. However, there are several disadvantages to this approach:
     
                                    
-
                                      
-
                                    • 
+
                                        
+
                                      • 
           It's not portable: there's no guarantee on the width of wchar_t,
           or even whether the runtime treats wide characters as Unicode at all, most
           Windows compilers do so, but many Unix systems do not.
         
                                        • 
-
                                      • 
+
                                      • 
           There's no support for Unicode-specific character classes: [[:Nd:]], [[:Po:]]
           etc.
         
                                        • 
-
                                      • 
+
                                      • 
           You can only search strings that are encoded as sequences of wide characters,
           it is not possible to search UTF-8, or even UTF-16 on many platforms.
         
                                        • 
 
                                      
 
                                      
-
+
       Use
       a Unicode Aware Regular Expression Type.
     
                                      
@@ -71,7 +71,7 @@
 
                                    
 
-
                                    
 
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
diff --git a/doc/html/index.html b/doc/html/index.html
index 5115fb6a..94c3ea42 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -3,7 +3,7 @@
 
 Boost.Regex
 
-
+
 
 
 
@@ -18,7 +18,7 @@
 
                                    
 
                                    
 
                                    Next
                                    
-
                                    
+
                                    
 
                                    
 
                                    
 
                                    
@@ -26,9 +26,9 @@
 
                                    
 John Maddock
 
                                    
-
                                    Copyright © 1998 -2010 John Maddock
                                    
+
                                    Copyright © 1998-2010 John Maddock
                                    
 
                                    
-
                                    
+
                                    
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
                                    
@@ -168,6 +168,9 @@
 
                                    High
         Level Class RegEx (Deprecated)
                                    
 
+
                                    Internal Details
                                    
+
                                    Unicode
+        Iterators
                                    
 
 
                                    Background Information
                                    
 
                                    
@@ -195,7 +198,7 @@
   
                                    
 
                                    
 
-
+
                                    Last revised: May 16, 2011 at 17:07:46 GMT
                                    Last revised: July 21, 2011 at 09:38:30 GMT
                                    		
 
                                    		
 
                                    
 
                                    
diff --git a/doc/regex.qbk b/doc/regex.qbk
index 703e7d9d..d6ad381d 100644
--- a/doc/regex.qbk
+++ b/doc/regex.qbk
@@ -85,6 +85,10 @@ PDF version of this manual is also available].
 [include old_regex.qbk]
 [endsect]
 
+[section Internal Details]
+[include unicode_iterators.qbk]
+[endsect]
+
 [endsect]
 
 [section Background Information]
diff --git a/include/boost/regex/icu.hpp b/include/boost/regex/icu.hpp
index e9a55c0c..6bb9a48f 100644
--- a/include/boost/regex/icu.hpp
+++ b/include/boost/regex/icu.hpp
@@ -764,13 +764,13 @@ template 
 inline std::pair< boost::u8_to_u32_iterator, boost::u8_to_u32_iterator >
    make_utf32_seq(I i, I j, mpl::int_<1> const*)
 {
-   return std::pair< boost::u8_to_u32_iterator, boost::u8_to_u32_iterator >(boost::u8_to_u32_iterator(i), boost::u8_to_u32_iterator(j));
+   return std::pair< boost::u8_to_u32_iterator, boost::u8_to_u32_iterator >(boost::u8_to_u32_iterator(i, i, j), boost::u8_to_u32_iterator(j, i, j));
 }
 template 
 inline std::pair< boost::u16_to_u32_iterator, boost::u16_to_u32_iterator >
    make_utf32_seq(I i, I j, mpl::int_<2> const*)
 {
-   return std::pair< boost::u16_to_u32_iterator, boost::u16_to_u32_iterator >(boost::u16_to_u32_iterator(i), boost::u16_to_u32_iterator(j));
+   return std::pair< boost::u16_to_u32_iterator, boost::u16_to_u32_iterator >(boost::u16_to_u32_iterator(i, i, j), boost::u16_to_u32_iterator(j, i, j));
 }
 template 
 inline std::pair< I, I >
@@ -782,13 +782,15 @@ template 
 inline std::pair< boost::u8_to_u32_iterator, boost::u8_to_u32_iterator >
    make_utf32_seq(const charT* p, mpl::int_<1> const*)
 {
-   return std::pair< boost::u8_to_u32_iterator, boost::u8_to_u32_iterator >(boost::u8_to_u32_iterator(p), boost::u8_to_u32_iterator(p+std::strlen((const char*)p)));
+   std::size_t len = std::strlen((const char*)p);
+   return std::pair< boost::u8_to_u32_iterator, boost::u8_to_u32_iterator >(boost::u8_to_u32_iterator(p, p, p+len), boost::u8_to_u32_iterator(p+len, p, p+len));
 }
 template 
 inline std::pair< boost::u16_to_u32_iterator, boost::u16_to_u32_iterator >
    make_utf32_seq(const charT* p, mpl::int_<2> const*)
 {
-   return std::pair< boost::u16_to_u32_iterator, boost::u16_to_u32_iterator >(boost::u16_to_u32_iterator(p), boost::u16_to_u32_iterator(p+u_strlen((const UChar*)p)));
+   std::size_t len = u_strlen((const UChar*)p);
+   return std::pair< boost::u16_to_u32_iterator, boost::u16_to_u32_iterator >(boost::u16_to_u32_iterator(p, p, p + len), boost::u16_to_u32_iterator(p+len, p, p + len));
 }
 template 
 inline std::pair< const charT*, const charT* >
diff --git a/include/boost/regex/pending/unicode_iterator.hpp b/include/boost/regex/pending/unicode_iterator.hpp
index a8faefd5..e6399b50 100644
--- a/include/boost/regex/pending/unicode_iterator.hpp
+++ b/include/boost/regex/pending/unicode_iterator.hpp
@@ -82,16 +82,16 @@ static const ::boost::uint32_t ten_bit_mask = 0x3FFu;
 
 inline bool is_high_surrogate(::boost::uint16_t v)
 {
-   return (v & 0xFC00u) == 0xd800u;
+   return (v & 0xFFFFFC00u) == 0xd800u;
 }
 inline bool is_low_surrogate(::boost::uint16_t v)
 {
-   return (v & 0xFC00u) == 0xdc00u;
+   return (v & 0xFFFFFC00u) == 0xdc00u;
 }
 template 
 inline bool is_surrogate(T v)
 {
-   return (v & 0xF800u) == 0xd800;
+   return (v & 0xFFFFF800u) == 0xd800;
 }
 
 inline unsigned utf8_byte_count(boost::uint8_t c)
@@ -303,6 +303,34 @@ public:
    {
       m_value = pending_read;
    }
+   //
+   // Range checked version:
+   //
+   u16_to_u32_iterator(BaseIterator b, BaseIterator start, BaseIterator end) : m_position(b)
+   {
+      m_value = pending_read;
+      //
+      // The range must not start with a low surrogate, or end in a high surrogate,
+      // otherwise we run the risk of running outside the underlying input range.
+      // Likewise b must not be located at a low surrogate.
+      //
+      boost::uint16_t val;
+      if(start != end)
+      {
+         if((b != start) && (b != end))
+         {
+            val = *b;
+            if(detail::is_surrogate(val) && ((val & 0xFC00u) == 0xDC00u))
+               invalid_code_point(val);
+         }
+         val = *start;
+         if(detail::is_surrogate(val) && ((val & 0xFC00u) == 0xDC00u))
+            invalid_code_point(val);
+         val = *--end;
+         if(detail::is_high_surrogate(val))
+            invalid_code_point(val);
+      }
+   }
 private:
    static void invalid_code_point(::boost::uint16_t val)
    {
@@ -504,7 +532,7 @@ public:
       while((*--m_position & 0xC0u) == 0x80u) ++count;
       // now check that the sequence was valid:
       if(count != detail::utf8_trailing_byte_count(*m_position))
-         invalid_sequnce();
+         invalid_sequence();
       m_value = pending_read;
    }
    BaseIterator base()const
@@ -520,8 +548,37 @@ public:
    {
       m_value = pending_read;
    }
+   //
+   // Checked constructor:
+   //
+   u8_to_u32_iterator(BaseIterator b, BaseIterator start, BaseIterator end) : m_position(b)
+   {
+      m_value = pending_read;
+      //
+      // We must not start with a continuation character, or end with a 
+      // truncated UTF-8 sequence otherwise we run the risk of going past
+      // the start/end of the underlying sequence:
+      //
+      if(start != end)
+      {
+         unsigned char v = *start;
+         if((v & 0xC0u) == 0x80u)
+            invalid_sequence();
+         if((b != start) && (b != end) && ((*b & 0xC0u) == 0x80u))
+            invalid_sequence();
+         BaseIterator pos = end;
+         do
+         {
+            v = *--pos;
+         }
+         while((start != pos) && ((v & 0xC0u) == 0x80u));
+         std::ptrdiff_t extra = detail::utf8_byte_count(v);
+         if(std::distance(pos, end) < extra)
+            invalid_sequence();
+      }
+   }
 private:
-   static void invalid_sequnce()
+   static void invalid_sequence()
    {
       std::out_of_range e("Invalid UTF-8 sequence encountered while trying to encode UTF-32 character");
       boost::throw_exception(e);
@@ -531,7 +588,7 @@ private:
       m_value = static_cast(static_cast< ::boost::uint8_t>(*m_position));
       // we must not have a continuation character:
       if((m_value & 0xC0u) == 0x80u)
-         invalid_sequnce();
+         invalid_sequence();
       // see how many extra byts we have:
       unsigned extra = detail::utf8_trailing_byte_count(*m_position);
       // extract the extra bits, 6 from each extra byte:
@@ -554,7 +611,7 @@ private:
       m_value &= masks[extra];
       // check the result:
       if(m_value > static_cast(0x10FFFFu))
-         invalid_sequnce();
+         invalid_sequence();
    }
    BaseIterator m_position;
    mutable U32Type m_value;
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index d31366f2..2c0d386a 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -124,7 +124,8 @@ test-suite regex
             ../build//boost_regex
       ]
       
-      [ run unicode/unicode_iterator_test.cpp ../build//boost_regex ]
+      [ run unicode/unicode_iterator_test.cpp ../build//boost_regex : : : TEST_UTF8 : unicode_iterator_test_utf8 ]
+      [ run unicode/unicode_iterator_test.cpp ../build//boost_regex : : : TEST_UTF16 : unicode_iterator_test_utf16 ]
       [ run static_mutex/static_mutex_test.cpp
             ../../thread/build//boost_thread ../build//boost_regex
       ]
diff --git a/test/unicode/unicode_iterator_test.cpp b/test/unicode/unicode_iterator_test.cpp
index 315a7690..30957970 100644
--- a/test/unicode/unicode_iterator_test.cpp
+++ b/test/unicode/unicode_iterator_test.cpp
@@ -22,6 +22,24 @@
 #include 
 #include 
 
+#if !defined(TEST_UTF8) && !defined(TEST_UTF16)
+#  define TEST_UTF8
+#  define TEST_UTF16
+#endif
+
+template 
+typename I::value_type iterate_over(I a, I b)
+{
+   typedef I::value_type value_type;
+   value_type v = 0;
+   while(a != b)
+   {
+      v ^= *a;
+      ++a;
+   }
+   return v;
+}
+
 void spot_checks()
 {
    // test specific values ripped straight out of the Unicode standard
@@ -61,6 +79,30 @@ void spot_checks()
    BOOST_CHECK_EQUAL(*--it8, 0xB0u);
    BOOST_CHECK_EQUAL(*--it8, 0xD0u);
    BOOST_CHECK_EQUAL(*--it8, 0x4Du);
+   //
+   // Test some bad sequences and verify that our iterators will catch them:
+   //
+   boost::uint8_t bad_seq[10] = { 0x4Du, 0xD0u, 0xB0u, 0xE4u, 0xBAu, 0x8Cu, 0xF0u, 0x90u, 0x8Cu, 0x82u };
+   BOOST_CHECK_EQUAL(
+      iterate_over(
+         boost::u8_to_u32_iterator(bad_seq, bad_seq, bad_seq + 10),
+         boost::u8_to_u32_iterator(bad_seq+10, bad_seq, bad_seq + 10)),
+      0x000149f3u);
+   BOOST_CHECK_THROW(boost::u8_to_u32_iterator(bad_seq, bad_seq, bad_seq + 9), std::out_of_range);
+   BOOST_CHECK_THROW(boost::u8_to_u32_iterator(bad_seq, bad_seq, bad_seq + 8), std::out_of_range);
+   BOOST_CHECK_THROW(boost::u8_to_u32_iterator(bad_seq, bad_seq, bad_seq + 7), std::out_of_range);
+   BOOST_CHECK_THROW(boost::u8_to_u32_iterator(bad_seq + 2, bad_seq, bad_seq + 10), std::out_of_range);
+   BOOST_CHECK_THROW(boost::u8_to_u32_iterator(bad_seq + 2, bad_seq + 2, bad_seq + 10), std::out_of_range);
+
+   boost::uint16_t bad_seq2[6] =  { 0xD800, 0xDF02, 0xD800, 0xDF02, 0xD800, 0xDF02 };
+   BOOST_CHECK_EQUAL(
+      iterate_over(
+         boost::u16_to_u32_iterator(bad_seq2, bad_seq2, bad_seq2 + 6),
+         boost::u16_to_u32_iterator(bad_seq2+6, bad_seq2, bad_seq2 + 6)),
+      66306u);
+   BOOST_CHECK_THROW(boost::u16_to_u32_iterator(bad_seq2, bad_seq2, bad_seq2 + 5), std::out_of_range);
+   BOOST_CHECK_THROW(boost::u16_to_u32_iterator(bad_seq2 + 1, bad_seq2 + 1, bad_seq2 + 6), std::out_of_range);
+   BOOST_CHECK_THROW(boost::u16_to_u32_iterator(bad_seq2 + 1, bad_seq2, bad_seq2 + 6), std::out_of_range);
 }
 
 void test(const std::vector< ::boost::uint32_t>& v)
@@ -84,6 +126,8 @@ void test(const std::vector< ::boost::uint32_t>& v)
    vector16_type v16;
    vector32_type v32;
    vector32_type::const_iterator i, j, k;
+
+#ifdef TEST_UTF16
    //
    // begin by testing forward iteration, of 32-16 bit interconversions:
    //
@@ -97,13 +141,13 @@ void test(const std::vector< ::boost::uint32_t>& v)
    BOOST_CHECK_EQUAL((std::size_t)std::distance(u32to16type(v.begin()), u32to16type(v.end())), v16.size());
 #endif
 #if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)
-   v32.assign(u16to32type(v16.begin()), u16to32type(v16.end()));
+   v32.assign(u16to32type(v16.begin(), v16.begin(), v16.end()), u16to32type(v16.end(), v16.begin(), v16.end()));
 #else
    v32.clear();
-   std::copy(u16to32type(v16.begin()), u16to32type(v16.end()), std::back_inserter(v32));
+   std::copy(u16to32type(v16.begin(), v16.begin(), v16.end()), u16to32type(v16.end(), v16.begin(), v16.end()), std::back_inserter(v32));
 #endif
 #ifndef BOOST_NO_STD_DISTANCE
-   BOOST_CHECK_EQUAL((std::size_t)std::distance(u16to32type(v16.begin()), u16to32type(v16.end())), v32.size());
+   BOOST_CHECK_EQUAL((std::size_t)std::distance(u16to32type(v16.begin(), v16.begin(), v16.end()), u16to32type(v16.end(), v16.begin(), v16.end())), v32.size());
 #endif
    BOOST_CHECK_EQUAL(v.size(), v32.size());
    i = v.begin();
@@ -120,9 +164,9 @@ void test(const std::vector< ::boost::uint32_t>& v)
    BOOST_CHECK_EQUAL((std::size_t)std::distance(ru32to16type(u32to16type(v.end())), ru32to16type(u32to16type(v.begin()))), v16.size());
 #endif
    std::reverse(v16.begin(), v16.end());
-   v32.assign(ru16to32type(u16to32type(v16.end())), ru16to32type(u16to32type(v16.begin())));
+   v32.assign(ru16to32type(u16to32type(v16.end(), v16.begin(), v16.end())), ru16to32type(u16to32type(v16.begin(), v16.begin(), v16.end())));
 #ifndef BOOST_NO_STD_DISTANCE
-   BOOST_CHECK_EQUAL((std::size_t)std::distance(ru16to32type(u16to32type(v16.end())), ru16to32type(u16to32type(v16.begin()))), v32.size());
+   BOOST_CHECK_EQUAL((std::size_t)std::distance(ru16to32type(u16to32type(v16.end(), v16.begin(), v16.end())), ru16to32type(u16to32type(v16.begin(), v16.begin(), v16.end()))), v32.size());
 #endif
    BOOST_CHECK_EQUAL(v.size(), v32.size());
    std::reverse(v32.begin(), v32.end());
@@ -132,6 +176,9 @@ void test(const std::vector< ::boost::uint32_t>& v)
    k = v32.begin();
    BOOST_CHECK_EQUAL_COLLECTIONS(v.begin(), v.end(), v32.begin(), v32.end());
 #endif
+#endif // TEST_UTF16
+
+#ifdef TEST_UTF8
    //
    // Test forward iteration, of 32-8 bit interconversions:
    //
@@ -145,13 +192,13 @@ void test(const std::vector< ::boost::uint32_t>& v)
    BOOST_CHECK_EQUAL((std::size_t)std::distance(u32to8type(v.begin()), u32to8type(v.end())), v8.size());
 #endif
 #if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)
-   v32.assign(u8to32type(v8.begin()), u8to32type(v8.end()));
+   v32.assign(u8to32type(v8.begin(), v8.begin(), v8.end()), u8to32type(v8.end(), v8.begin(), v8.end()));
 #else
    v32.clear();
-   std::copy(u8to32type(v8.begin()), u8to32type(v8.end()), std::back_inserter(v32));
+   std::copy(u8to32type(v8.begin(), v8.begin(), v8.end()), u8to32type(v8.end(), v8.begin(), v8.end()), std::back_inserter(v32));
 #endif
 #ifndef BOOST_NO_STD_DISTANCE
-   BOOST_CHECK_EQUAL((std::size_t)std::distance(u8to32type(v8.begin()), u8to32type(v8.end())), v32.size());
+   BOOST_CHECK_EQUAL((std::size_t)std::distance(u8to32type(v8.begin(), v8.begin(), v8.end()), u8to32type(v8.end(), v8.begin(), v8.end())), v32.size());
 #endif
    BOOST_CHECK_EQUAL(v.size(), v32.size());
    i = v.begin();
@@ -168,9 +215,9 @@ void test(const std::vector< ::boost::uint32_t>& v)
    BOOST_CHECK_EQUAL((std::size_t)std::distance(ru32to8type(u32to8type(v.end())), ru32to8type(u32to8type(v.begin()))), v8.size());
 #endif
    std::reverse(v8.begin(), v8.end());
-   v32.assign(ru8to32type(u8to32type(v8.end())), ru8to32type(u8to32type(v8.begin())));
+   v32.assign(ru8to32type(u8to32type(v8.end(), v8.begin(), v8.end())), ru8to32type(u8to32type(v8.begin(), v8.begin(), v8.end())));
 #ifndef BOOST_NO_STD_DISTANCE
-   BOOST_CHECK_EQUAL((std::size_t)std::distance(ru8to32type(u8to32type(v8.end())), ru8to32type(u8to32type(v8.begin()))), v32.size());
+   BOOST_CHECK_EQUAL((std::size_t)std::distance(ru8to32type(u8to32type(v8.end(), v8.begin(), v8.end())), ru8to32type(u8to32type(v8.begin(), v8.begin(), v8.end()))), v32.size());
 #endif
    BOOST_CHECK_EQUAL(v.size(), v32.size());
    std::reverse(v32.begin(), v32.end());
@@ -180,6 +227,26 @@ void test(const std::vector< ::boost::uint32_t>& v)
    k = v32.begin();
    BOOST_CHECK_EQUAL_COLLECTIONS(v.begin(), v.end(), v32.begin(), v32.end());
 #endif
+#endif // TEST_UTF8
+   //
+   // Test checked construction of UTF-8/16 iterators at each location in the sequences:
+   //
+#ifdef TEST_UTF8
+   for(u8to32type v8p(v8.begin(), v8.begin(), v8.end()), v8e(v8.end(), v8.begin(), v8.end()); v8p != v8e; ++v8p)
+   {
+      u8to32type pos(v8p.base(), v8p.base(), v8.end());
+      BOOST_CHECK(pos == v8p);
+      BOOST_CHECK(*pos == *v8p);
+   }
+#endif
+#ifdef TEST_UTF16
+   for(u16to32type v16p(v16.begin(), v16.begin(), v16.end()), v16e(v16.end(), v16.begin(), v16.end()); v16p != v16e; ++v16p)
+   {
+      u16to32type pos(v16p.base(), v16p.base(), v16.end());
+      BOOST_CHECK(pos == v16p);
+      BOOST_CHECK(*pos == *v16p);
+   }
+#endif
 }
 
 int test_main( int, char* [] ) 
@@ -189,6 +256,7 @@ int test_main( int, char* [] )
    // now test a bunch of values for self-consistency and round-tripping:
    std::vector< ::boost::uint32_t> v;
    // start with boundary conditions:
+   /*
    v.push_back(0);
    v.push_back(0xD7FF);
    v.push_back(0xE000);
@@ -201,6 +269,11 @@ int test_main( int, char* [] )
    v.push_back(0x800u - 1);
    v.push_back(0x10000u);
    v.push_back(0x10000u - 1);
+   */
+   for(unsigned i = 0; i < 0xD800; ++i)
+      v.push_back(i);
+   for(unsigned i = 0xDFFF + 1; i < 0x10FFFF; ++i)
+      v.push_back(i);
    test(v);
    return 0;
 }